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/fc208820 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/fc208820 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/fc208820 Branch: refs/heads/master Commit: fc20882025dd1830b85c626522fd64da03080f20 Parents: 50672a7 fdb3fc9 Author: shamrath <[email protected]> Authored: Thu Apr 9 16:15:33 2015 -0400 Committer: shamrath <[email protected]> Committed: Thu Apr 9 16:15:33 2015 -0400 ---------------------------------------------------------------------- .../test-suite/multi-tenanted-airavata/README | 2 +- .../test-suite/multi-tenanted-airavata/pom.xml | 29 ++++ .../ApplicationRegister.java | 147 +++++++++++-------- .../ComputeResourceRegister.java | 2 +- .../ExperimentExecution.java | 140 ++++++++++-------- .../FrameworkBootstrapping.java | 2 +- .../multitenantedairavata/GatewayRegister.java | 23 ++- .../utils/FrameworkUtils.java | 54 +++++++ .../utils/TestFrameworkConstants.java | 3 + .../main/resources/test-framework.properties | 3 + 10 files changed, 275 insertions(+), 130 deletions(-) ----------------------------------------------------------------------
