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/82f34a4f Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/82f34a4f Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/82f34a4f Branch: refs/heads/workflow-support Commit: 82f34a4ff74d3da3044b2efcb6fd64df3cbbdf8b Parents: b0fde67 e18f552 Author: lahiru <[email protected]> Authored: Sat Jul 12 13:00:08 2014 -0400 Committer: lahiru <[email protected]> Committed: Sat Jul 12 13:00:08 2014 -0400 ---------------------------------------------------------------------- .../resources/conf/app-catalog-identifiers.ini | 14 ++--- .../php-cli-samples/createExperiment.php | 9 +-- .../deleteGatewayComputeResourcePreference.php | 50 ++++++++++++++++ .../php-cli-samples/getAiravataClient.php | 2 + .../getGatewayComputeResourcePreference.php | 62 ++++++++++++++++++++ .../tools/RegisterSampleApplications.java | 45 +++++++------- .../client/tools/DocumentCreatorNew.java | 8 +-- 7 files changed, 155 insertions(+), 35 deletions(-) ----------------------------------------------------------------------
