You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by er...@apache.org on 2014/08/15 20:39:06 UTC
[1/2] git commit: Corrected and formatted php messages prompted at
command line
Repository: airavata
Updated Branches:
refs/heads/master d62a957db -> 010b85fcf
Corrected and formatted php messages prompted at command line
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c44ec636
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c44ec636
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c44ec636
Branch: refs/heads/master
Commit: c44ec6366d7cd85cd13c97729d9c1970d437bef0
Parents: b19a8e0
Author: Eroma Abeysinghe <er...@gmail.com>
Authored: Fri Aug 15 14:30:30 2014 -0400
Committer: Eroma Abeysinghe <er...@gmail.com>
Committed: Fri Aug 15 14:30:30 2014 -0400
----------------------------------------------------------------------
.../conf/airavata-client-properties.ini | 2 +-
.../resources/conf/app-catalog-identifiers.ini | 4 ++-
.../php-cli-samples/cloneExperiment.php | 26 ++++++++--------
.../php-cli-samples/createExperiment.php | 8 ++---
.../resources/php-cli-samples/createProject.php | 3 +-
.../deleteApplicationInterface.php | 12 ++++----
.../php-cli-samples/deleteComputeResource.php | 16 +++++-----
.../getAllComputeResourceNames.php | 8 ++---
.../getAllExperimentsInProject.php | 6 ++--
.../php-cli-samples/getAllUserExperiments.php | 6 ++--
.../php-cli-samples/getAllUserProjects.php | 6 ++--
.../getApplicationDeployedResources.php | 16 +++++-----
.../getApplicationDeployment.php | 16 +++++-----
.../php-cli-samples/getApplicationInputs.php | 22 +++++++-------
.../php-cli-samples/getApplicationModule.php | 12 ++++----
.../php-cli-samples/getApplicationOutputs.php | 18 ++++++------
...getAvailableAppInterfaceComputeResources.php | 16 +++++-----
.../php-cli-samples/getComputeResource.php | 17 ++++++-----
.../resources/php-cli-samples/getExperiment.php | 15 +++++-----
.../php-cli-samples/getExperimentOutputs.php | 14 ++++-----
.../php-cli-samples/getExperimentStatus.php | 14 ++++-----
.../getGatewayComputeResourcePreference.php | 16 +++++-----
.../php-cli-samples/launchExperiment.php | 14 ++++-----
.../registerApplicationDeployment.php | 16 +++++-----
.../registerApplicationModule.php | 10 +++----
.../php-cli-samples/registerComputeResource.php | 14 ++++-----
.../search_experiments_by_application.php | 8 ++---
.../search_experiments_by_description.php | 8 ++---
.../search_experiments_by_name.php | 10 +++----
.../php-cli-samples/terminateExperiment.php | 14 ++++-----
.../php-cli-samples/updateExperiment.php | 31 ++++++++++----------
.../resources/php-cli-samples/updateProject.php | 5 ++--
32 files changed, 205 insertions(+), 198 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/conf/airavata-client-properties.ini
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/conf/airavata-client-properties.ini b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/conf/airavata-client-properties.ini
index 0fc113d..959a77f 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/conf/airavata-client-properties.ini
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/conf/airavata-client-properties.ini
@@ -8,7 +8,7 @@ THRIFT_LIB_DIR = "../lib/Thrift/"
AIRAVATA_PHP_STUBS_DIR = "../lib/Airavata/"
; Host which runs the Airavata Server
-AIRAVATA_SERVER = "gw56.iu.xsede.org"
+AIRAVATA_SERVER = "gw111.iu.xsede.org"
;AIRAVATA_SERVER = "localhost"
; Airavata Server thrift port
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/conf/app-catalog-identifiers.ini
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/conf/app-catalog-identifiers.ini b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/conf/app-catalog-identifiers.ini
index 7380248..50ae5b2 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/conf/app-catalog-identifiers.ini
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/conf/app-catalog-identifiers.ini
@@ -11,4 +11,6 @@ wrfInterfaceId=WRF_a390e041-cae3-4b85-9bb9-e03df666deb9
autoDockInterfaceId=
nwChemInterfaceId=NWChem_bdc7b97a-dd39-49cb-b203-6d779781d5c8
lammpsInterfaceId=LAMMPS_f43520e2-b77a-4f11-b3b7-98693349fcd0
-echoInterfaceId=Echo_271e6d47-a5db-434e-8453-e27985b7ea59
+echoInterfaceId=Echo_c6e6aaac-7d9d-44fc-aba2-63b5100528e8
+
+#echoInterfaceId=Echo_271e6d47-a5db-434e-8453-e27985b7ea59
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/cloneExperiment.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/cloneExperiment.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/cloneExperiment.php
index 1942ff5..4740624 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/cloneExperiment.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/cloneExperiment.php
@@ -42,7 +42,7 @@ use Airavata\API\AiravataClient;
if ($argc != 2)
{
- echo 'php cloneExperiment.php <experiment_id>';
+ echo 'Please provide the Experiment ID.'."\n". 'Usage: php cloneExperiment.php <experiment_ID>'."\n";
}
else
{
@@ -52,7 +52,7 @@ else
var_dump($clone);
- echo "Created clone with ID $clone->experimentID named $clone->name \n\n";
+ echo "Successfully created a clone with experiment_ID $clone->experimentID and experiment_name $clone->name"."\n";
}
//var_dump($experiment);
@@ -76,27 +76,27 @@ function get_experiment($expId)
}
catch (InvalidRequestException $ire)
{
- echo 'InvalidRequestException!<br><br>' . $ire->getMessage();
+ echo 'Invalid Request Exception!'."\n". $ire->getMessage();
}
catch (ExperimentNotFoundException $enf)
{
- echo 'ExperimentNotFoundException!<br><br>' . $enf->getMessage();
+ echo 'Experiment Not Found Exception!'."\n". $enf->getMessage();
}
catch (AiravataClientException $ace)
{
- echo 'AiravataClientException!<br><br>' . $ace->getMessage();
+ echo 'Airavata Client Exception!'."\n". $ace->getMessage();
}
catch (AiravataSystemException $ase)
{
- echo 'AiravataSystemException during get!<br><br>' . $ase->getMessage();
+ echo 'Airavata System Exception during get!'."\n". $ase->getMessage();
}
catch (TTransportException $tte)
{
- echo 'TTransportException!<br><br>' . $tte->getMessage();
+ echo 'TTransport Exception!'."\n". $tte->getMessage();
}
catch (\Exception $e)
{
- echo 'Exception!<br><br>' . $e->getMessage();
+ echo 'Exception!'."\n". $e->getMessage();
}
}
@@ -118,23 +118,23 @@ function clone_experiment($expId)
}
catch (InvalidRequestException $ire)
{
- echo 'InvalidRequestException!<br><br>' . $ire->getMessage();
+ echo 'Invalid Request Exception!'."\n". $ire->getMessage();
}
catch (ExperimentNotFoundException $enf)
{
- echo 'ExperimentNotFoundException!<br><br>' . $enf->getMessage();
+ echo 'Experiment Not Found Exception!'."\n". $enf->getMessage();
}
catch (AiravataClientException $ace)
{
- echo 'AiravataClientException!<br><br>' . $ace->getMessage();
+ echo 'Airavata Client Exception!'."\n". $ace->getMessage();
}
catch (AiravataSystemException $ase)
{
- echo 'AiravataSystemException during clone!<br><br>' . $ase->getMessage();
+ echo 'Airavata System Exception during clone!'."\n". $ase->getMessage();
}
catch (TTransportException $tte)
{
- echo 'TTransportException!<br><br>' . $tte->getMessage();
+ echo 'TTransport Exception!'."\n". $tte->getMessage();
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/createExperiment.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/createExperiment.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/createExperiment.php
index 628d848..08529f8 100755
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/createExperiment.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/createExperiment.php
@@ -46,7 +46,7 @@ use Airavata\Model\Workspace\Experiment\DataType;
try {
if ($argc < 4) {
- echo "Usage: php createExperiment.php <username> <experiment_name> <project_ID> \n";
+ echo "Please provide the User, Experiment Name and the Project ID."."\n". "Usage: php createExperiment.php <user_name> <experiment_name> <project_ID> \n"."\n";
} else {
/* User provides input values */
@@ -118,14 +118,14 @@ try {
if ($experimentId) {
var_dump($experiment);
- echo "Experiment $experimentId is created! \n ";
+ echo "Experiment $experimentId is successfully created! \n "."\n";
} else {
- echo "Failed to create experiment. \n";
+ echo "Failed to create experiment. \n"."\n";
}
}
} catch (InvalidRequestException $ire) {
- print 'InvalidRequestException: ' . $ire->getMessage() . "\n";
+ print 'Invalid Request Exception: ' . $ire->getMessage() . "\n";
} catch (AiravataClientException $ace) {
print 'Airavata System Exception: ' . $ace->getMessage() . "\n";
} catch (AiravataSystemException $ase) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/createProject.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/createProject.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/createProject.php
index 8586734..5fef0d9 100755
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/createProject.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/createProject.php
@@ -36,8 +36,7 @@ use Airavata\Model\Workspace\Project;
try {
if ($argc < 3) {
- echo 'php createProject.php <user_name> <project_name>';
- echo 'php createProject.php <user_name> <project_name>';
+ echo 'Please provide User and the Project Name for the new Project.'."\n". 'Usage: php createProject.php <user_name> <project_name>'."\n";
} else {
$project = new Project();
$project->owner = $argv[1];
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/deleteApplicationInterface.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/deleteApplicationInterface.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/deleteApplicationInterface.php
index ba0b52e..d705ffb 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/deleteApplicationInterface.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/deleteApplicationInterface.php
@@ -41,7 +41,7 @@ try
{
if (count($argv) != 2) {
- exit("\n Incorrect Arguments \n. Usage: deleteApplicationInterface.php <application interface id>. \n");
+ exit("\n Incorrect Arguments \n. Usage: deleteApplicationInterface.php <application_interface_ID>. \n");
} else {
$appInterfaceId = $argv[1];
@@ -49,15 +49,15 @@ try
$success = $airavataclient->deleteApplicationInterface($appInterfaceId);
if ($success) {
- echo "Application Interface $appInterfaceId successfully deleted";
+ echo "Application Interface $appInterfaceId is successfully deleted!";
} else {
- echo "\n Failed to delete application interface $appInterfaceId \n";
+ echo "\n Failed to delete application interface $appInterfaceId. \n";
}
}
}
catch (InvalidRequestException $ire)
{
- print 'InvalidRequestException: ' . $ire->getMessage()."\n";
+ print 'Invalid Request Exception: ' . $ire->getMessage()."\n";
}
catch (AiravataClientException $ace)
{
@@ -69,11 +69,11 @@ catch (AiravataSystemException $ase)
}
catch (TTransportException $tte)
{
- echo 'TTransportException!<br><br>' . $tte->getMessage();
+ echo 'TTransport Exception!' . $tte->getMessage();
}
catch (\Exception $e)
{
- echo 'Exception!<br><br>' . $e->getMessage();
+ echo 'Exception!' . $e->getMessage();
}
$transport->close();
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/deleteComputeResource.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/deleteComputeResource.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/deleteComputeResource.php
index fe352ea..f0c6016 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/deleteComputeResource.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/deleteComputeResource.php
@@ -40,7 +40,7 @@ use Airavata\Model\AppCatalog\AppDeployment\ApplicationModule;
try {
if (count($argv) != 2) {
- exit("\n Incorrect Arguments \n. Usage: deleteComputeResource.php <compute resource id>. \n");
+ exit("\n Incorrect Arguments \n. Usage: deleteComputeResource.php <compute_resource_ID. "."\n");
} else {
$computeResourceId = $argv[1];
@@ -48,21 +48,21 @@ try {
$success = $airavataclient->deleteComputeResource($computeResourceId);
if ($success) {
- echo "Application Interface $computeResourceId successfully deleted";
+ echo "Application Interface $computeResourceId is successfully deleted!";
} else {
- echo "\n Failed to delete application interface $computeResourceId \n";
+ echo "\n Failed to delete Application Interface $computeResourceId. \n";
}
}
} catch (InvalidRequestException $ire) {
- print 'InvalidRequestException: ' . $ire->getMessage() . "\n";
+ print 'Invalid Request Exception: '."\n" . $ire->getMessage() . "\n";
} catch (AiravataClientException $ace) {
- print 'Airavata System Exception: ' . $ace->getMessage() . "\n";
+ print 'Airavata System Exception: '."\n" . $ace->getMessage() . "\n";
} catch (AiravataSystemException $ase) {
- print 'Airavata System Exception: ' . $ase->getMessage() . "\n";
+ print 'Airavata System Exception: '."\n" . $ase->getMessage() . "\n";
} catch (TTransportException $tte) {
- echo 'TTransportException!<br><br>' . $tte->getMessage();
+ echo 'TTransport Exception!'."\n" . $tte->getMessage();
} catch (\Exception $e) {
- echo 'Exception!<br><br>' . $e->getMessage();
+ echo 'Exception!'."\n" . $e->getMessage();
}
$transport->close();
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getAllComputeResourceNames.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getAllComputeResourceNames.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getAllComputeResourceNames.php
index 49e7386..e70f2b2 100755
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getAllComputeResourceNames.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getAllComputeResourceNames.php
@@ -39,18 +39,18 @@ try {
if ($appInterfaceComputeResources) {
var_dump($appInterfaceComputeResources);
} else {
- echo "\n Failed to fetch compute resources. \n";
+ echo "\n Failed to fetch Compute Resources. \n";
}
} catch (InvalidRequestException $ire) {
- print 'InvalidRequestException: ' . $ire->getMessage() . "\n";
+ print 'Invalid Request Exception: ' . $ire->getMessage() . "\n";
} catch (AiravataClientException $ace) {
print 'Airavata System Exception: ' . $ace->getMessage() . "\n";
} catch (AiravataSystemException $ase) {
print 'Airavata System Exception: ' . $ase->getMessage() . "\n";
} catch (TTransportException $tte) {
- echo 'TTransportException!<br><br>' . $tte->getMessage();
+ echo 'TTransportException!' . $tte->getMessage();
} catch (\Exception $e) {
- echo 'Exception!<br><br>' . $e->getMessage();
+ echo 'Exception!' . $e->getMessage();
}
$transport->close();
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getAllExperimentsInProject.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getAllExperimentsInProject.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getAllExperimentsInProject.php
index 3ace547..508894c 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getAllExperimentsInProject.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getAllExperimentsInProject.php
@@ -40,15 +40,15 @@ use Airavata\API\AiravataClient;
try {
if ($argc != 2) {
- echo 'Usage: php getAllExperimentsInProject.php <project_ID>';
+ echo 'Please provide the Project ID.'."\n". 'Usage: php getAllExperimentsInProject.php <project_ID>'."\n";
} else {
$projectExperiments = $airavataclient->getAllExperimentsInProject($argv[1]);
- echo '# of project experiments = ' . sizeof($projectExperiments);
+ echo '# of Experiments created with given Project = ' . sizeof($projectExperiments)."\n";
var_dump($projectExperiments);
}
} catch (InvalidRequestException $ire) {
- print 'InvalidRequestException: ' . $ire->getMessage() . "\n";
+ print 'Invalid Request Exception: ' . $ire->getMessage() . "\n";
} catch (AiravataClientException $ace) {
print 'Airavata System Exception: ' . $ace->getMessage() . "\n";
} catch (AiravataSystemException $ase) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getAllUserExperiments.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getAllUserExperiments.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getAllUserExperiments.php
index 1d48073..63d05d7 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getAllUserExperiments.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getAllUserExperiments.php
@@ -41,12 +41,12 @@ try
{
if ($argc != 2)
{
- echo 'php getAllUserExperiments.php <username>';
+ echo 'Please provide the User.'."\n". 'Usage: php getAllUserExperiments.php <user_name>'."\n";
}
else
{
$userExperiments = $airavataclient->getAllUserExperiments($argv[1]);
- echo '# of user experiments = ' . sizeof($userExperiments) . ' ';
+ echo '# of User Experiments = ' . sizeof($userExperiments) ."\n". ' ';
var_dump($userExperiments);
}
@@ -59,7 +59,7 @@ try
}
catch (InvalidRequestException $ire)
{
- print 'InvalidRequestException: ' . $ire->getMessage()."\n";
+ print 'Invalid Request Exception: ' . $ire->getMessage()."\n";
}
catch (AiravataClientException $ace)
{
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getAllUserProjects.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getAllUserProjects.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getAllUserProjects.php
index b532f73..74a4f0e 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getAllUserProjects.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getAllUserProjects.php
@@ -39,14 +39,14 @@ use Airavata\API\AiravataClient;
try {
if ($argc != 2) {
- echo "Usage: php getAllUserProjects.php <user> \n";
+ echo "Please provide the User."."\n". "Usage: php getAllUserProjects.php <user_name> \n"."\n";
} else {
$userProjects = $airavataclient->getAllUserProjects($argv[1]);
- echo '# of user projects = ' . sizeof($userProjects) . ' ';
+ echo '# of Projects created by the User = ' . sizeof($userProjects) ."\n". ' ';
var_dump($userProjects);
}
} catch (InvalidRequestException $ire) {
- print 'InvalidRequestException: ' . $ire->getMessage() . "\n";
+ print 'Invalid Request Exception: ' . $ire->getMessage() . "\n";
} catch (AiravataClientException $ace) {
print 'Airavata System Exception: ' . $ace->getMessage() . "\n";
} catch (AiravataSystemException $ase) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getApplicationDeployedResources.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getApplicationDeployedResources.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getApplicationDeployedResources.php
index f6cc195..121abba 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getApplicationDeployedResources.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getApplicationDeployedResources.php
@@ -41,7 +41,7 @@ use Thrift\Transport\TSocket;
use Airavata\API\AiravataClient;
if ($argc != 2) {
- exit("Usage: php getApplicationDeployedResources.php <appModuleID> \n");
+ exit("Please provide a valid Application Module ID."."\n". "Usage: php getApplicationDeployedResources.php <application_module_ID>". "\n"."\n");
}
$appModuleId = $argv[1];
@@ -49,7 +49,7 @@ $appModuleId = $argv[1];
$deployedresources = get_application_deployed_resources($appModuleId);
if (empty($deployedresources)) {
- echo "deployment returned an empty list \n";
+ echo "Deployment returned an empty list \n";
} else {
foreach ($deployedresources as $resource) {
echo "$resource->type: $resource->value <br><br>";
@@ -73,17 +73,17 @@ function get_application_deployed_resources($appModuleId)
try {
return $airavataclient->getAppModuleDeployedResources($appModuleId);
} catch (InvalidRequestException $ire) {
- echo 'InvalidRequestException!<br><br>' . $ire->getMessage();
+ echo 'Invalid Request Exception!'."\n" . $ire->getMessage();
} catch (ExperimentNotFoundException $enf) {
- echo 'ExperimentNotFoundException!<br><br>' . $enf->getMessage();
+ echo 'Experiment Not Found Exception!'."\n" . $enf->getMessage();
} catch (AiravataClientException $ace) {
- echo 'AiravataClientException!<br><br>' . $ace->getMessage();
+ echo 'Airavata Client Exception!'."\n". $ace->getMessage();
} catch (AiravataSystemException $ase) {
- echo 'AiravataSystemException!<br><br>' . $ase->getMessage();
+ echo 'Airavata System Exception!'."\n" . $ase->getMessage();
} catch (TTransportException $tte) {
- echo 'TTransportException!<br><br>' . $tte->getMessage();
+ echo 'TTransport Exception!'."\n" . $tte->getMessage();
} catch (\Exception $e) {
- echo 'Exception!<br><br>' . $e->getMessage();
+ echo 'Exception!'."\n" . $e->getMessage();
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getApplicationDeployment.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getApplicationDeployment.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getApplicationDeployment.php
index 2d01f31..d8c673a 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getApplicationDeployment.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getApplicationDeployment.php
@@ -36,8 +36,8 @@ use Thrift\Exception\TTransportException;
use Airavata\Model\AppCatalog\AppDeployment\ApplicationModule;
try {
- if ($argc < 1) {
- echo 'php getApplicationDeployment.php <Application Deployment Id>';
+ if ($argc < 2) {
+ echo 'Please provide and Application Deployment ID.'."\n".'Usage: php getApplicationDeployment.php <app_deployment_ID>'."\n";
} else {
$appDeploymentId = $argv[1];
@@ -46,20 +46,20 @@ try {
if ($appDeployment) {
var_dump($appDeployment);
} else {
- echo "\n Failed to fetch application deployment description. \n";
+ echo "\n Failed to fetch Application Deployment information. \n";
}
}
} catch (InvalidRequestException $ire) {
- echo 'InvalidRequestException!<br><br>' . $ire->getMessage();
+ echo 'Invalid Request Exception!'."\n" . $ire->getMessage();
} catch (AiravataClientException $ace) {
- echo 'AiravataClientException!<br><br>' . $ace->getMessage();
+ echo 'Airavata Client Exception!'."\n" . $ace->getMessage();
} catch (AiravataSystemException $ase) {
- echo 'AiravataSystemException!<br><br>' . $ase->getMessage();
+ echo 'Airavata System Exception!'."\n" . $ase->getMessage();
} catch (TTransportException $tte) {
- echo 'TTransportException!<br><br>' . $tte->getMessage();
+ echo 'TTransport Exception!'."\n" . $tte->getMessage();
} catch (\Exception $e) {
- echo 'Exception!<br><br>' . $e->getMessage();
+ echo 'Exception!'."\n" . $e->getMessage();
}
?>
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getApplicationInputs.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getApplicationInputs.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getApplicationInputs.php
index 8d0f5be..d7688da 100755
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getApplicationInputs.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getApplicationInputs.php
@@ -36,10 +36,12 @@ use Airavata\Model\AppCatalog\AppInterface\DataType;
try {
- if ($argc < 1) {
- echo 'php getApplicationInputs.php <appInterfaceId>';
+ if ($argc < 2) {
+ echo ('Please provide a valid Application Interface ID.'."\n". 'Usage: php getApplicationInputs.php <app_interface_ID>'."\n");
} else {
-
+//if (count($argv) < 2) {
+ //exit("Please provide an Application Module ID."."\n". "Usage: php getApplicationModule.php <app_module_ID>". "\n"."\n");
+//}
$appInterfaceId = $argv[1];
$appInputs = $airavataclient->getApplicationInputs($appInterfaceId);
@@ -48,22 +50,22 @@ try {
foreach ($appInputs as $appInput) {
var_dump($appInput);
$inputType = DataType::$__names[$appInput->type];
- echo "\n Application Input Name: $appInput->name \t Input Type $inputType \n";
+ echo "Application Input Name: $appInput->name \t Input Type $inputType \n";
}
} else {
- echo "\n Failed to fetch application interface Inputs. \n";
+ echo "Failed to fetch Application Interface Inputs."." \n";
}
}
} catch (InvalidRequestException $ire) {
- print 'InvalidRequestException: ' . $ire->getMessage() . "\n";
+ print 'Invalid Request Exception: '. "\n" . $ire->getMessage() . "\n";
} catch (AiravataClientException $ace) {
- print 'Airavata System Exception: ' . $ace->getMessage() . "\n";
+ print 'Airavata System Exception: '. "\n" . $ace->getMessage() . "\n";
} catch (AiravataSystemException $ase) {
- print 'Airavata System Exception: ' . $ase->getMessage() . "\n";
+ print 'Airavata System Exception: '. "\n" . $ase->getMessage() . "\n";
} catch (TTransportException $tte) {
- echo 'TTransportException!<br><br>' . $tte->getMessage();
+ echo 'TTransport Exception!' . "\n". $tte->getMessage();
} catch (\Exception $e) {
- echo 'Exception!<br><br>' . $e->getMessage();
+ echo 'Exception!' . "\n". $e->getMessage();
}
$transport->close();
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getApplicationModule.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getApplicationModule.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getApplicationModule.php
index 80cba4e..4d45618 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getApplicationModule.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getApplicationModule.php
@@ -37,7 +37,7 @@ use Airavata\Model\AppCatalog\AppDeployment\ApplicationModule;
if (count($argv) < 2) {
- exit("Please provide an appModuleID. \n");
+ exit("Please provide an Application Module ID."."\n". "Usage: php getApplicationModule.php <app_module_ID>". "\n"."\n");
}
$appModuleId = $argv[1];
@@ -60,15 +60,15 @@ function get_appModule($appModuleId)
try {
return $airavataclient->getApplicationModule($appModuleId);
} catch (InvalidRequestException $ire) {
- echo 'InvalidRequestException!<br><br>' . $ire->getMessage();
+ echo 'Invalid Request Exception!'."\n" . $ire->getMessage();
} catch (AiravataClientException $ace) {
- echo 'AiravataClientException!<br><br>' . $ace->getMessage();
+ echo 'Airavata Client Exception!'."\n" . $ace->getMessage();
} catch (AiravataSystemException $ase) {
- echo 'AiravataSystemException!<br><br>' . $ase->getMessage();
+ echo 'Airavata System Exception!'."\n" . $ase->getMessage();
} catch (TTransportException $tte) {
- echo 'TTransportException!<br><br>' . $tte->getMessage();
+ echo 'TTransport Exception!'."\n" . $tte->getMessage();
} catch (\Exception $e) {
- echo 'Exception!<br><br>' . $e->getMessage();
+ echo 'Exception!'."\n". $e->getMessage();
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getApplicationOutputs.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getApplicationOutputs.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getApplicationOutputs.php
index d4db12c..a3607a6 100755
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getApplicationOutputs.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getApplicationOutputs.php
@@ -36,8 +36,8 @@ use Airavata\Model\AppCatalog\AppInterface\DataType;
try {
- if ($argc < 1) {
- echo 'php getApplicationOutputs.php <appInterfaceId>';
+ if ($argc < 2) {
+ echo 'Please provide a valid Application Interface ID.'."\n".'Usage: php getApplicationOutputs.php <app_interface_ID>'."\n";
} else {
$appInterfaceId = $argv[1];
@@ -47,22 +47,22 @@ try {
if ($appOutputs) {
foreach ($appOutputs as $appOutput) {
$outputType = DataType::$__names[$appOutput->type];
- echo "\n Application Output Name: $appOutput->name \t Output Type $outputType \n";
+ echo "Application Output Name: $appOutput->name \t Output Type $outputType \n";
}
} else {
- echo "\n Failed to fetch application interface Outputs. \n";
+ echo "Failed to fetch Application Interface Outputs. \n";
}
}
} catch (InvalidRequestException $ire) {
- print 'InvalidRequestException: ' . $ire->getMessage() . "\n";
+ print 'Invalid Request Exception: '."\n" . $ire->getMessage() . "\n";
} catch (AiravataClientException $ace) {
- print 'Airavata System Exception: ' . $ace->getMessage() . "\n";
+ print 'Airavata System Exception: '."\n" . $ace->getMessage() . "\n";
} catch (AiravataSystemException $ase) {
- print 'Airavata System Exception: ' . $ase->getMessage() . "\n";
+ print 'Airavata System Exception: ' ."\n". $ase->getMessage() . "\n";
} catch (TTransportException $tte) {
- echo 'TTransportException!<br><br>' . $tte->getMessage();
+ echo 'TTransport Exception!<br><br>'."\n" . $tte->getMessage();
} catch (\Exception $e) {
- echo 'Exception!<br><br>' . $e->getMessage();
+ echo 'Exception!'."\n" . $e->getMessage();
}
$transport->close();
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getAvailableAppInterfaceComputeResources.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getAvailableAppInterfaceComputeResources.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getAvailableAppInterfaceComputeResources.php
index b17e5a3..2aeedf3 100755
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getAvailableAppInterfaceComputeResources.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getAvailableAppInterfaceComputeResources.php
@@ -36,9 +36,9 @@ use Thrift\Exception\TTransportException;
try
{
- if ($argc < 1)
+ if ($argc < 2)
{
- echo 'php getAvailableAppInterfaceComputeResources.php <appInterfaceId>';
+ echo 'Please provide a valid Application Interface ID.'."\n". "Usage: php getAvailableAppInterfaceComputeResources.php <app_interface_ID>"."\n";
}
else {
@@ -49,29 +49,29 @@ try
if ($appInterfaceComputeResources) {
var_dump($appInterfaceComputeResources);
} else {
- echo "\n Failed to fetch application interface compute resources. \n";
+ echo "\n Failed to fetch Application Interfaces deployed Compute Resources. \n";
}
}
}
catch (InvalidRequestException $ire)
{
- print 'InvalidRequestException: ' . $ire->getMessage()."\n";
+ print 'Invalid Request Exception:'."\n" . $ire->getMessage()."\n";
}
catch (AiravataClientException $ace)
{
- print 'Airavata System Exception: ' . $ace->getMessage()."\n";
+ print 'Airavata System Exception:'."\n" . $ace->getMessage()."\n";
}
catch (AiravataSystemException $ase)
{
- print 'Airavata System Exception: ' . $ase->getMessage()."\n";
+ print 'Airavata System Exception: '."\n" . $ase->getMessage()."\n";
}
catch (TTransportException $tte)
{
- echo 'TTransportException!<br><br>' . $tte->getMessage();
+ echo 'TTransport Exception!'."\n" . $tte->getMessage();
}
catch (\Exception $e)
{
- echo 'Exception!<br><br>' . $e->getMessage();
+ echo 'Exception!'."\n" . $e->getMessage();
}
$transport->close();
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getComputeResource.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getComputeResource.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getComputeResource.php
index 6cfb9f6..6847575 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getComputeResource.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getComputeResource.php
@@ -36,8 +36,8 @@ use Thrift\Exception\TTransportException;
use Airavata\Model\AppCatalog\AppDeployment\ApplicationModule;
try {
- if ($argc < 1) {
- echo 'php getComputeResource.php <Compute Resource Id>';
+ if ($argc < 2) {
+ echo 'Please provide a valid Compute Resource ID.' ."\n". "Usage: php getComputeResource.php <compute_resource_ID>"."\n";
} else {
$computeResourceId = $argv[1];
@@ -46,20 +46,21 @@ try {
if ($computeResource) {
var_dump($computeResource);
} else {
- echo "\n Failed to fetch compute resource description. \n";
+ echo "Failed to fetch Compute Resource description. \n";
}
}
} catch (InvalidRequestException $ire) {
- echo 'InvalidRequestException!<br><br>' . $ire->getMessage();
+ echo 'Invalid Request Exception!'."\n" . $ire->getMessage();
} catch (AiravataClientException $ace) {
- echo 'AiravataClientException!<br><br>' . $ace->getMessage();
+ echo 'Airavata Client Exception!'."\n" . $ace->getMessage();
} catch (AiravataSystemException $ase) {
- echo 'AiravataSystemException!<br><br>' . $ase->getMessage();
+ echo 'Airavata System Exception!'."\n" . $ase->getMessage();
} catch (TTransportException $tte) {
- echo 'TTransportException!<br><br>' . $tte->getMessage();
+ echo 'TTransport Exception!'."\n" . $tte->getMessage();
} catch (\Exception $e) {
- echo 'Exception!<br><br>' . $e->getMessage();
+ echo 'Exception!'."\n"
+ . $e->getMessage();
}
?>
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getExperiment.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getExperiment.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getExperiment.php
index 94df89c..1a4eec9 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getExperiment.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getExperiment.php
@@ -42,24 +42,25 @@ use Airavata\API\AiravataClient;
try {
if (count($argv) < 2) {
- exit("Please provide an experimentID. Usage: \n");
+ exit("Please provide a valid Experiment ID."."\n". "Usage: php getExperiment.php <experiment_ID>". "\n"."\n");
} else {
$experimentId = $argv[1];
$experiment = $airavataclient->getExperiment($experimentId);
var_dump($experiment);
+ echo "Experiment is successfully retrieved!\n\n";
}
} catch (InvalidRequestException $ire) {
- echo 'InvalidRequestException!<br><br>' . $ire->getMessage();
+ echo 'Invalid Request Exception!'. "\n". $ire->getMessage();
} catch (ExperimentNotFoundException $enf) {
- echo 'ExperimentNotFoundException!<br><br>' . $enf->getMessage();
+ echo 'Experiment Not Found Exception!'. "\n".$enf->getMessage();
} catch (AiravataClientException $ace) {
- echo 'AiravataClientException!<br><br>' . $ace->getMessage();
+ echo 'Airavata Client Exception!'. "\n". $ace->getMessage();
} catch (AiravataSystemException $ase) {
- echo 'AiravataSystemException!<br><br>' . $ase->getMessage();
+ echo 'Airavata System Exception!'. "\n". $ase->getMessage();
} catch (TTransportException $tte) {
- echo 'TTransportException!<br><br>' . $tte->getMessage();
+ echo 'TTransport Exception!'. "\n". $tte->getMessage();
} catch (\Exception $e) {
- echo 'Exception!<br><br>' . $e->getMessage();
+ echo 'Exception!'. "\n". $e->getMessage();
}
$transport->close();
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getExperimentOutputs.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getExperimentOutputs.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getExperimentOutputs.php
index 25c3c58..5fbe85b 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getExperimentOutputs.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getExperimentOutputs.php
@@ -36,7 +36,7 @@ use Thrift\Exception\TTransportException;
try {
if ($argc != 2) {
- exit("Please specify a Experiment Id. Usage: php getExperimentOutputs.php <experiment_id> \n");
+ exit("Please provide a valid Experiment ID."."\n". "Usage: php getExperimentOutputs.php <experiment_ID> \n"."\n");
} else {
$experimentId = $argv[1];
@@ -49,17 +49,17 @@ try {
}
}
} catch (InvalidRequestException $ire) {
- echo 'InvalidRequestException!<br><br>' . $ire->getMessage();
+ echo 'Invalid Request Exception!'."\n". $ire->getMessage();
} catch (ExperimentNotFoundException $enf) {
- echo 'ExperimentNotFoundException!<br><br>' . $enf->getMessage();
+ echo 'Experiment Not Found Exception!'."\n" . $enf->getMessage();
} catch (AiravataClientException $ace) {
- echo 'AiravataClientException!<br><br>' . $ace->getMessage();
+ echo 'Airavata Client Exception!'."\n" . $ace->getMessage();
} catch (AiravataSystemException $ase) {
- echo 'AiravataSystemException!<br><br>' . $ase->getMessage();
+ echo 'Airavata System Exception!'."\n" . $ase->getMessage();
} catch (TTransportException $tte) {
- echo 'TTransportException!<br><br>' . $tte->getMessage();
+ echo 'TTransport Exception!'."\n" . $tte->getMessage();
} catch (\Exception $e) {
- echo 'Exception!<br><br>' . $e->getMessage();
+ echo 'Exception!'."\n" . $e->getMessage();
}
$transport->close();
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getExperimentStatus.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getExperimentStatus.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getExperimentStatus.php
index 77939b3..a298535 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getExperimentStatus.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getExperimentStatus.php
@@ -41,25 +41,25 @@ use Airavata\API\AiravataClient;
try {
if (count($argv) < 2) {
- exit("Please provide an experimentID. Usage: php getExperimentStatus.php <experimentId> \n");
+ exit("Plese provide the Experiment ID."."\n". "Usage: php getExperimentStatus.php <experiment_ID> \n"."\n");
} else {
$experimentId = $argv[1];
$experimentStatus = $airavataclient->getExperimentStatus($experimentId);
- echo "experiment status = " . ExperimentState::$__names[$experimentStatus->experimentState] . " \n<br>";
+ echo "Experiment Status = " . ExperimentState::$__names[$experimentStatus->experimentState] . " \n<br>";
}
} catch (InvalidRequestException $ire) {
- echo 'InvalidRequestException!<br><br>' . $ire->getMessage();
+ echo 'Invalid Request Exception!'."\n". $ire->getMessage();
} catch (ExperimentNotFoundException $enf) {
- echo 'ExperimentNotFoundException!<br><br>' . $enf->getMessage();
+ echo 'Experiment Not Found Exception!'."\n". $enf->getMessage();
} catch (AiravataClientException $ace) {
- echo 'AiravataClientException!<br><br>' . $ace->getMessage();
+ echo 'Airavata Client Exception!'."\n". $ace->getMessage();
} catch (AiravataSystemException $ase) {
- echo 'AiravataSystemException!<br><br>' . $ase->getMessage();
+ echo 'Airavata System Exception'."\n". $ase->getMessage();
} catch (\Exception $e) {
- echo 'Exception!<br><br>' . $e->getMessage();
+ echo 'Exception!'."\n". $e->getMessage();
}
$transport->close();
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getGatewayComputeResourcePreference.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getGatewayComputeResourcePreference.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getGatewayComputeResourcePreference.php
index c250473..119d5d2 100755
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getGatewayComputeResourcePreference.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/getGatewayComputeResourcePreference.php
@@ -37,9 +37,9 @@ use Airavata\Model\AppCatalog\AppInterface\DataType;
try
{
- if ($argc < 2)
+ if ($argc < 3)
{
- echo 'php getGatewayComputeResourcePreference.php <gateway id> <compute resource id>';
+ echo 'Please provide valid Gateway ID and Compute Resoruce ID.'."\n". "php getGatewayComputeResourcePreference.php <gateway_ID> <compute_resource_ID>"."\n";
}
else {
@@ -51,29 +51,29 @@ try
if ($computeResourcePreferences) {
var_dump($computeResourcePreferences);
} else {
- echo "\n Failed to fetch compute resource preference Inputs. \n";
+ echo "Failed to fetch Compute Resource preference of the Gateway. \n";
}
}
}
catch (InvalidRequestException $ire)
{
- print 'InvalidRequestException: ' . $ire->getMessage()."\n";
+ print 'Invalid Request Exception: '."\n" . $ire->getMessage()."\n";
}
catch (AiravataClientException $ace)
{
- print 'Airavata System Exception: ' . $ace->getMessage()."\n";
+ print 'Airavata System Exception: '."\n" . $ace->getMessage()."\n";
}
catch (AiravataSystemException $ase)
{
- print 'Airavata System Exception: ' . $ase->getMessage()."\n";
+ print 'Airavata System Exception: '."\n" . $ase->getMessage()."\n";
}
catch (TTransportException $tte)
{
- echo 'TTransportException!<br><br>' . $tte->getMessage();
+ echo 'TTransport Exception!'."\n" . $tte->getMessage();
}
catch (\Exception $e)
{
- echo 'Exception!<br><br>' . $e->getMessage();
+ echo 'Exception!'."\n" . $e->getMessage();
}
$transport->close();
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/launchExperiment.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/launchExperiment.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/launchExperiment.php
index af67681..0a6208a 100755
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/launchExperiment.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/launchExperiment.php
@@ -43,22 +43,22 @@ use Airavata\Model\Workspace\Experiment\Experiment;
try {
if (count($argv) < 2) {
- exit("Please provide the experimentId to be launched. Usage: php launchExperiment.php <experimentId> \n");
+ exit("Please provide the Experiment ID to be launched."."\n". "Usage: php launchExperiment.php <experiment_ID> \n"."\n");
} else {
$experimentId = $argv[1];
$airavataclient->launchExperiment($experimentId, $airavataconfig['AIRAVATA_CREDENTIAL_STORE_TOKEN']);
- echo "Experiment $experimentId is launched. \n";
+ echo "Experiment $experimentId is Successfully launched! \n";
}
} catch (InvalidRequestException $ire) {
- print 'InvalidRequestException: ' . $ire->getMessage() . "\n";
+ print 'Invalid Request Exception: ' ."\n" . $ire->getMessage() . "\n";
} catch (AiravataClientException $ace) {
- print 'Airavata System Exception: ' . $ace->getMessage() . "\n";
+ print 'Airavata System Exception: '."\n" . $ace->getMessage() . "\n";
} catch (AiravataSystemException $ase) {
- print 'Airavata System Exception: ' . $ase->getMessage() . "\n";
+ print 'Airavata System Exception: '."\n" . $ase->getMessage() . "\n";
} catch (ExperimentNotFoundException $enf) {
- print 'Experiment Not Found Exception: ' . $enf->getMessage() . "\n";
+ print 'Experiment Not Found Exception: '."\n" . $enf->getMessage() . "\n";
} catch (LaunchValidationException $lve) {
- print 'Experiment Validation Failed: ' . $lve->getMessage() . "\n";
+ print 'Experiment Validation Failed: '."\n" . $lve->getMessage() . "\n";
}
$transport->close();
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/registerApplicationDeployment.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/registerApplicationDeployment.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/registerApplicationDeployment.php
index 241c49c..0e73c42 100755
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/registerApplicationDeployment.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/registerApplicationDeployment.php
@@ -39,7 +39,7 @@ try
{
if ($argc != 4)
{
- echo 'php registerApplicationDeployment.php <appModuleId> <computeHostId> <executablePath>';
+ echo 'Please provide valid Application Module ID, Compute Resource ID and the Exectable Path.' ."\n". 'Usage: php registerApplicationDeployment.php <app_module_ID> <compute_resource_ID> <executable_path>'."\n";
}
else
{
@@ -59,33 +59,33 @@ try
if ($appDeploymentId)
{
var_dump($appDeployment);
- echo "Application Deployment $appDeploymentId is registered! \n ";
+ echo "Application Deployment $appDeploymentId is successfully registered! \n ";
}
else
{
- echo "Failed to register application deployment. \n";
+ echo "Failed to register Application Deployment. \n";
}
}
}
catch (InvalidRequestException $ire)
{
- print 'InvalidRequestException: ' . $ire->getMessage()."\n";
+ print 'Invalid Request Exception: '."\n" . $ire->getMessage()."\n";
}
catch (AiravataClientException $ace)
{
- print 'Airavata System Exception: ' . $ace->getMessage()."\n";
+ print 'Airavata System Exception: '."\n" . $ace->getMessage()."\n";
}
catch (AiravataSystemException $ase)
{
- print 'Airavata System Exception: ' . $ase->getMessage()."\n";
+ print 'Airavata System Exception: '."\n" . $ase->getMessage()."\n";
}
catch (TTransportException $tte)
{
- echo 'TTransportException!<br><br>' . $tte->getMessage();
+ echo 'TTransportException!'."\n" . $tte->getMessage();
}
catch (\Exception $e)
{
- echo 'Exception!<br><br>' . $e->getMessage();
+ echo 'Exception!'."\n" . $e->getMessage();
}
$transport->close();
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/registerApplicationModule.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/registerApplicationModule.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/registerApplicationModule.php
index f139232..bccb21c 100755
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/registerApplicationModule.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/registerApplicationModule.php
@@ -38,7 +38,7 @@ try
{
if ($argc != 4)
{
- echo 'php registerApplicationModule.php <appModuleName> <appModuleVersion> <appModuleDescription>';
+ echo 'Please provide Application Module Name, Version & Description.'."\n". 'php registerApplicationModule.php <app_module_name> <app_module_version> <app_module_description>'."\n";
}
else
{
@@ -56,17 +56,17 @@ try
if ($appModuleId)
{
var_dump($appModule);
- echo "Application Module $appModuleId is registered! \n ";
+ echo "Application Module $appModuleId is successfully registered! \n ";
}
else
{
- echo "Failed to register application module. \n";
+ echo "Application Module Registration Failed!."." \n";
}
}
}
catch (InvalidRequestException $ire)
{
- print 'InvalidRequestException: ' . $ire->getMessage()."\n";
+ print 'Invalid Request Exception: ' . $ire->getMessage()."\n";
}
catch (AiravataClientException $ace)
{
@@ -78,7 +78,7 @@ catch (AiravataSystemException $ase)
}
catch (\Exception $e)
{
- echo 'Exception!<br><br>' . $e->getMessage();
+ echo 'Exception!' . $e->getMessage();
}
$transport->close();
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/registerComputeResource.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/registerComputeResource.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/registerComputeResource.php
index f6137bd..9ef0cc7 100755
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/registerComputeResource.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/registerComputeResource.php
@@ -38,7 +38,7 @@ try
{
if ($argc != 3)
{
- echo 'php registerComputeResource.php <hostName> <resourceDescription>';
+ echo 'Please provide Compute Resource Name and Description.'."\n". 'Usage: php registerComputeResource.php <resource_name> <resource_description>'."\n";
}
else
{
@@ -57,29 +57,29 @@ try
if ($computeResourceId)
{
var_dump($computeResource);
- echo "\n Compute Resource $computeResourceId is registered! \n ";
+ echo "Compute Resource $computeResourceId is successfully registered! \n ";
}
else
{
- echo "\n Failed to register compute resource description. \n";
+ echo "Failed to register Compute Resource description. \n";
}
}
}
catch (InvalidRequestException $ire)
{
- print 'InvalidRequestException: ' . $ire->getMessage()."\n";
+ print 'Invalid Request Exception: '."\n" . $ire->getMessage()."\n";
}
catch (AiravataClientException $ace)
{
- print 'Airavata System Exception: ' . $ace->getMessage()."\n";
+ print 'Airavata System Exception: '."\n" . $ace->getMessage()."\n";
}
catch (AiravataSystemException $ase)
{
- print 'Airavata System Exception: ' . $ase->getMessage()."\n";
+ print 'Airavata System Exception: '."\n" . $ase->getMessage()."\n";
}
catch (\Exception $e)
{
- echo 'Exception!<br><br>' . $e->getMessage();
+ echo 'Exception!'."\n" . $e->getMessage();
}
$transport->close();
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/search_experiments_by_application.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/search_experiments_by_application.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/search_experiments_by_application.php
index 48c15ee..4f1aaf2 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/search_experiments_by_application.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/search_experiments_by_application.php
@@ -41,7 +41,7 @@ try
{
if ($argc != 3) {
- echo 'php search_experiments_by_application.php <username> <project_ID>';
+ echo 'Please provide a valid User and an Application Interface ID.'."\n". 'Usage: php search_experiments_by_application.php <user_name> <app_interface_ID>'."\n";
}
else {
@@ -54,15 +54,15 @@ try
}
catch (InvalidRequestException $ire)
{
- print 'InvalidRequestException: ' . $ire->getMessage()."\n";
+ print 'Invalid Request Exception: '."\n" . $ire->getMessage()."\n";
}
catch (AiravataClientException $ace)
{
- print 'Airavata System Exception: ' . $ace->getMessage()."\n";
+ print 'Airavata System Exception: '."\n" . $ace->getMessage()."\n";
}
catch (AiravataSystemException $ase)
{
- print 'Airavata System Exception: ' . $ase->getMessage()."\n";
+ print 'Airavata System Exception: '."\n" . $ase->getMessage()."\n";
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/search_experiments_by_description.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/search_experiments_by_description.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/search_experiments_by_description.php
index fff6c38..20fefde 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/search_experiments_by_description.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/search_experiments_by_description.php
@@ -41,7 +41,7 @@ try
{
if ($argc != 3) {
- echo 'php search_experiments_by_description.php <username> <project_ID>';
+ echo 'Please provide a valid User and a Description.'."\n". 'Usage: php search_experiments_by_description.php <user_name> <description>'."\n";
}
else {
@@ -54,15 +54,15 @@ try
}
catch (InvalidRequestException $ire)
{
- print 'InvalidRequestException: ' . $ire->getMessage()."\n";
+ print 'Invalid Request Exception: '."\n" . $ire->getMessage()."\n";
}
catch (AiravataClientException $ace)
{
- print 'Airavata System Exception: ' . $ace->getMessage()."\n";
+ print 'Airavata System Exception: '."\n" . $ace->getMessage()."\n";
}
catch (AiravataSystemException $ase)
{
- print 'Airavata System Exception: ' . $ase->getMessage()."\n";
+ print 'Airavata System Exception: ' ."\n". $ase->getMessage()."\n";
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/search_experiments_by_name.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/search_experiments_by_name.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/search_experiments_by_name.php
index 34f4799..fd6d8dc 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/search_experiments_by_name.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/search_experiments_by_name.php
@@ -41,12 +41,12 @@ try
{
if ($argc != 3) {
- echo 'php search_experiments_by_name.php <username> <project_ID>';
+ echo 'Please provide a valid User and an Experiment Name or part of the Name.' ."\n". 'Usage: php search_experiments_by_name.php <user_name> <experiment_name>'."\n";
}
else {
$experiments = $airavataclient->searchExperimentsByName($argv[1], $argv[2]);
- echo '# results = ' . sizeof($experiments) . ' <br><br>';
+ echo '# results = ' . sizeof($experiments) . ' '."\n";
var_dump($experiments);
}
@@ -54,15 +54,15 @@ try
}
catch (InvalidRequestException $ire)
{
- print 'InvalidRequestException: ' . $ire->getMessage()."\n";
+ print 'Invalid Request Exception: '."\n" . $ire->getMessage()."\n";
}
catch (AiravataClientException $ace)
{
- print 'Airavata System Exception: ' . $ace->getMessage()."\n";
+ print 'Airavata System Exception: '."\n" . $ace->getMessage()."\n";
}
catch (AiravataSystemException $ase)
{
- print 'Airavata System Exception: ' . $ase->getMessage()."\n";
+ print 'Airavata System Exception: '."\n" . $ase->getMessage()."\n";
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/terminateExperiment.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/terminateExperiment.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/terminateExperiment.php
index f242474..39f7879 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/terminateExperiment.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/terminateExperiment.php
@@ -43,13 +43,13 @@ use Airavata\API\AiravataClient;
if ($argc != 2)
{
- echo 'php terminateExperiment.php <experiment_id>';
+ echo 'Please provide a valid Experiment ID.'."\n". 'Usage: php terminateExperiment.php <experiment_ID>'."\n";
}
else
{
terminate_experiment($argv[1]);
- echo 'If there are no exceptions, assume the experiment terminated successfully';
+ echo 'If there are no exceptions, assume the Experiment is terminated successfully.';
}
@@ -70,23 +70,23 @@ function terminate_experiment($expId)
}
catch (InvalidRequestException $ire)
{
- echo 'InvalidRequestException!\n\n' . $ire->getMessage();
+ echo 'Invalid Request Exception!\n\n' . $ire->getMessage();
}
catch (ExperimentNotFoundException $enf)
{
- echo 'ExperimentNotFoundException!\n\n' . $enf->getMessage();
+ echo 'Experiment Not Found Exception!\n\n' . $enf->getMessage();
}
catch (AiravataClientException $ace)
{
- echo 'AiravataClientException!\n\n' . $ace->getMessage();
+ echo 'Airavata Client Exception!\n\n' . $ace->getMessage();
}
catch (AiravataSystemException $ase)
{
- echo 'AiravataSystemException!\n\n' . $ase->getMessage();
+ echo 'Airavata System Exception!\n\n' . $ase->getMessage();
}
catch (TTransportException $tte)
{
- echo 'TTransportException!\n\n' . $tte->getMessage();
+ echo 'TTransport Exception!\n\n' . $tte->getMessage();
}
catch (\Exception $e)
{
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/updateExperiment.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/updateExperiment.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/updateExperiment.php
index f3ea3d7..f07da85 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/updateExperiment.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/updateExperiment.php
@@ -41,7 +41,7 @@ use Thrift\Transport\TSocket;
use Airavata\API\AiravataClient;
if ($argc != 2) {
- echo 'php updateExperiment.php <experiment_id>';
+ echo 'Please provide the Experiment ID.'."\n".'Usage: php updateExperiment.php <experiment_ID>'."\n";
} else {
update_experiment($argv[1]);
}
@@ -61,17 +61,17 @@ function get_experiment($expId)
try {
return $airavataclient->getExperiment($expId);
} catch (InvalidRequestException $ire) {
- echo 'InvalidRequestException!<br><br>' . $ire->getMessage();
+ echo 'Invalid Request Exception!' ."\n". $ire->getMessage();
} catch (ExperimentNotFoundException $enf) {
- echo 'ExperimentNotFoundException!<br><br>' . $enf->getMessage();
+ echo 'Experiment Not Found Exception!' ."\n". $enf->getMessage();
} catch (AiravataClientException $ace) {
- echo 'AiravataClientException!<br><br>' . $ace->getMessage();
+ echo 'Airavata Client Exception!' ."\n". $ace->getMessage();
} catch (AiravataSystemException $ase) {
- echo 'AiravataSystemException during get!<br><br>' . $ase->getMessage();
+ echo 'Airavata System Exception during get!' ."\n". $ase->getMessage();
} catch (TTransportException $tte) {
- echo 'TTransportException!<br><br>' . $tte->getMessage();
+ echo 'TTransport Exception!' ."\n". $tte->getMessage();
} catch (\Exception $e) {
- echo 'Exception!<br><br>' . $e->getMessage();
+ echo 'Exception!' ."\n". $e->getMessage();
}
}
@@ -94,19 +94,20 @@ function update_experiment($expId)
$updatedExperiment = $airavataclient->getExperiment($expId);
- echo "Experiment $experiment->name updated:\n\n";
- var_dump($updatedExperiment);
+ var_dump($updatedExperiment);
+ echo "Experiment $experiment->name is successfully updated!\n\n";
+
} catch (InvalidRequestException $ire) {
- echo 'InvalidRequestException!<br><br>' . $ire->getMessage();
+ echo 'Invalid Request Exception!' ."\n". $ire->getMessage();
} catch (ExperimentNotFoundException $enf) {
- echo 'ExperimentNotFoundException!<br><br>' . $enf->getMessage();
+ echo 'Experiment Not Found Exception!' ."\n". $enf->getMessage();
} catch (AiravataClientException $ace) {
- echo 'AiravataClientException!<br><br>' . $ace->getMessage();
+ echo 'Airavata Client Exception!' ."\n". $ace->getMessage();
} catch (AiravataSystemException $ase) {
- echo 'AiravataSystemException during update!<br><br>' . $ase->getMessage();
+ echo 'Airavata System Exception during update!' ."\n". $ase->getMessage();
} catch (TTransportException $tte) {
- echo 'TTransportException!<br><br>' . $tte->getMessage();
- }
+ echo 'TTransport Exception!' ."\n". $tte->getMessage();
+ }
}
?>
http://git-wip-us.apache.org/repos/asf/airavata/blob/c44ec636/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/updateProject.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/updateProject.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/updateProject.php
index bac05ed..beddcf4 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/updateProject.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/updateProject.php
@@ -39,12 +39,13 @@ use Airavata\API\AiravataClient;
try {
if ($argc != 3) {
- echo 'php updateProject.php <project_id> <project_description>';
+ echo 'Please provide the Project ID and the Description.'."\n". 'Usage: php updateProject.php <project_ID> <project_description>'."\n"."\n";
} else {
$project = $airavataclient->getProject($argv[1]);
$project->description = $argv[2];
$airavataclient->updateProject($argv[1], $project);
- echo 'Project ' . $argv[1] . ' successfully modified.';
+
+ echo 'Project ' . $argv[1] . ' is successfully modified!'."\n"."\n";
}
} catch (InvalidRequestException $ire) {
print 'InvalidRequestException: ' . $ire->getMessage() . "\n";
[2/2] git commit: Resolving conflict in .ini file
Posted by er...@apache.org.
Resolving conflict in .ini file
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/010b85fc
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/010b85fc
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/010b85fc
Branch: refs/heads/master
Commit: 010b85fcf44d75f706c85e632f372b07fb52d296
Parents: c44ec63 d62a957
Author: Eroma Abeysinghe <er...@gmail.com>
Authored: Fri Aug 15 14:35:45 2014 -0400
Committer: Eroma Abeysinghe <er...@gmail.com>
Committed: Fri Aug 15 14:35:45 2014 -0400
----------------------------------------------------------------------
.../resources/conf/app-catalog-identifiers.ini | 3 +-
.../client/samples/CreateLaunchExperiment.java | 48 +-
.../samples/TestCreateLaunchExperiment.java | 19 +
.../data/model/ApplicationDeployment.java | 22 +
.../data/model/ApplicationInterface.java | 23 +
.../catalog/data/model/ApplicationModule.java | 23 +
.../catalog/data/model/ComputeResource.java | 27 +-
.../data/model/DataMovementInterface.java | 28 +-
.../data/model/DataMovementProtocol.java | 152 ++--
.../data/model/DataMovementProtocolPK.java | 148 ++--
.../catalog/data/model/GatewayProfile.java | 23 +
.../catalog/data/model/GridftpDataMovement.java | 27 +-
.../catalog/data/model/GridftpEndpoint.java | 30 +-
.../data/model/JobSubmissionInterface.java | 28 +-
.../data/model/JobSubmissionProtocol.java | 154 ++--
.../data/model/JobSubmissionProtocolPK.java | 148 ++--
.../catalog/data/model/LocalSubmission.java | 27 +-
.../catalog/data/model/ResourceJobManager.java | 23 +
.../catalog/data/model/ScpDataMovement.java | 28 +-
.../catalog/data/model/SshJobSubmission.java | 28 +-
.../catalog/data/model/Workflow.java | 23 +
.../data/resources/AppDeploymentResource.java | 21 +
.../data/resources/AppInterfaceResource.java | 21 +
.../data/resources/AppModuleResource.java | 21 +
.../data/resources/ComputeResourceResource.java | 25 +-
.../DataMovementInterfaceResource.java | 21 +
.../resources/DataMovementProtocolResource.java | 720 +++++++++----------
.../data/resources/GatewayProfileResource.java | 21 +
.../resources/GridftpDataMovementResource.java | 21 +
.../data/resources/GridftpEndpointResource.java | 21 +
.../JobSubmissionInterfaceResource.java | 21 +
.../JobSubmissionProtocolResource.java | 718 +++++++++---------
.../data/resources/LocalSubmissionResource.java | 21 +
.../resources/ResourceJobManagerResource.java | 21 +
.../data/resources/ScpDataMovementResource.java | 21 +
.../resources/SshJobSubmissionResource.java | 21 +
.../data/resources/WorkflowResource.java | 21 +
.../catalog/data/util/AppCatalogJPAUtils.java | 126 +++-
.../data/util/AppCatalogThriftConversion.java | 32 +-
.../src/main/resources/META-INF/persistence.xml | 2 -
.../src/main/resources/appcatalog-derby.sql | 68 +-
.../src/main/resources/appcatalog-mysql.sql | 62 +-
.../src/test/resources/appcatalog-derby.sql | 68 +-
.../airavata/gfac/server/GfacServerHandler.java | 8 +-
.../gfac/bes/provider/impl/BESProvider.java | 5 +-
.../airavata/gfac/core/cpi/BetterGfacImpl.java | 142 +++-
.../org/apache/airavata/gfac/core/cpi/GFac.java | 8 +
.../apache/airavata/gfac/core/cpi/GFacImpl.java | 51 ++
.../core/monitor/GfacInternalStatusUpdator.java | 11 +-
.../gfac/core/provider/GFacProvider.java | 3 +-
.../org/apache/airavata/job/TestProvider.java | 2 +-
.../apache/airavata/gfac/ec2/EC2Provider.java | 2 +-
.../gfac/gram/provider/impl/GramProvider.java | 4 +-
.../gsissh/provider/impl/GSISSHProvider.java | 5 +-
.../hadoop/provider/impl/HadoopProvider.java | 2 +-
.../gfac/local/provider/impl/LocalProvider.java | 2 +-
.../gfac/ssh/provider/impl/SSHProvider.java | 3 +-
.../server/OrchestratorServerHandler.java | 153 +++-
.../core/impl/GFACEmbeddedJobSubmitter.java | 4 +
.../core/impl/GFACServiceJobSubmitter.java | 56 +-
.../orchestrator/core/job/JobSubmitter.java | 9 +
.../airavata/orchestrator/cpi/Orchestrator.java | 7 +-
.../cpi/impl/SimpleOrchestratorImpl.java | 18 +-
.../src/main/resources/registry-mysql.sql | 2 +-
64 files changed, 2390 insertions(+), 1233 deletions(-)
----------------------------------------------------------------------