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/ac9dc30f Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ac9dc30f Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ac9dc30f Branch: refs/heads/master Commit: ac9dc30f53e2b64ce7abb0d0cf724770d51d10d6 Parents: 9a0024a 26cf7ed Author: Lahiru Gunathilake <[email protected]> Authored: Wed Apr 1 10:25:14 2015 -0400 Committer: Lahiru Gunathilake <[email protected]> Committed: Wed Apr 1 10:25:14 2015 -0400 ---------------------------------------------------------------------- .../src/main/resources/appcatalog-mysql.sql | 4 +- .../test-suite/multi-tenanted-airavata/pom.xml | 15 + .../multitenantedairavata/AiravataClient.java | 4 +- .../ApplicationRegister.java | 18 +- .../ComputeResourceRegister.java | 7 +- .../ExperimentExecution.java | 323 +++++++++++++++++++ .../FrameworkBootstrapping.java | 44 +++ .../multitenantedairavata/FrameworkSetup.java | 73 +++++ .../multitenantedairavata/GatewayRegister.java | 220 +++++++++++++ .../multitenantedairavata/LoadTester.java | 50 +++ .../testsuite/multitenantedairavata/Setup.java | 208 ------------ .../utils/TestFrameworkConstants.java | 10 + .../main/resources/airavata-client.properties | 7 + 13 files changed, 757 insertions(+), 226 deletions(-) ----------------------------------------------------------------------
