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/d8923697 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d8923697 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d8923697 Branch: refs/heads/master Commit: d89236975ad8e48bed81acccf545a4f2fb301845 Parents: d798cab aff5d92 Author: Lahiru Gunathilake <[email protected]> Authored: Tue Mar 31 10:22:50 2015 -0400 Committer: Lahiru Gunathilake <[email protected]> Committed: Tue Mar 31 10:22:50 2015 -0400 ---------------------------------------------------------------------- .../client/samples/CreateLaunchBES.java | 487 +++++++++++++++++++ .../client/samples/RegisterSampleData.java | 9 + .../tools/RegisterSampleApplications.java | 38 +- .../tools/RegisterSampleApplicationsUtils.java | 3 +- .../appcatalog/cpi/WorkflowCatalog.java | 4 + .../catalog/data/impl/WorkflowCatalogImpl.java | 21 + .../data/resources/WorkflowOutputResource.java | 4 +- .../server/src/main/resources/PBSTemplate.xslt | 2 +- .../gfac/bes/utils/ApplicationProcessor.java | 58 ++- .../airavata/gfac/bes/utils/BESConstants.java | 4 + .../gfac/bes/utils/DataTransferrer.java | 7 +- .../gfac/bes/utils/ResourceProcessor.java | 8 +- .../gfac/bes/utils/UASDataStagingProcessor.java | 5 +- .../airavata/gfac/ssh/util/GFACSSHUtils.java | 3 +- .../airavata-orchestrator-service/pom.xml | 2 +- .../test-suite/multi-tenanted-airavata/pom.xml | 10 + .../multitenantedairavata/AiravataClient.java | 6 +- .../ApplicationRegister.java | 326 +++++++++++++ .../ComputeResourceRegister.java | 226 +++++++++ .../testsuite/multitenantedairavata/Setup.java | 178 ++++++- .../utils/PropertyReader.java | 2 +- .../utils/TestFrameworkConstants.java | 36 ++ .../main/resources/airavata-client.properties | 11 + .../main/resources/test-framework.properties | 9 +- modules/workflow/workflow-core/pom.xml | 3 +- .../core/SimpleWorkflowInterpreter.java | 18 + .../core/parser/AiravataWorkflowParser.java | 1 + .../ui/dialogs/registry/RegistryWindow.java | 2 +- .../WorkflowInterpreterLaunchWindow.java | 105 ++-- 29 files changed, 1508 insertions(+), 80 deletions(-) ----------------------------------------------------------------------
