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/ba8538dd Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ba8538dd Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ba8538dd Branch: refs/heads/master Commit: ba8538ddfb0419fe30df0129371231684d478bde Parents: 44e5ed1 9ce24a5 Author: Shameera Rathanyaka <[email protected]> Authored: Fri Sep 18 16:21:23 2015 -0400 Committer: Shameera Rathanyaka <[email protected]> Committed: Fri Sep 18 16:21:23 2015 -0400 ---------------------------------------------------------------------- .../apache/airavata/integration/BaseCaseIT.java | 38 ++-- .../airavata/integration/DataRetrievalIT.java | 56 +++--- .../airavata/integration/SimpleEchoIT.java | 27 +-- .../SingleAppIntegrationTestBase.java | 25 +-- .../WorkflowIntegrationTestBase.java | 13 +- .../integration/tools/DocumentCreatorNew.java | 165 +++++++++--------- .../integration/tools/DocumentCreatorUtils.java | 11 +- .../multitenantedairavata/AiravataClient.java | 4 +- .../ApplicationRegister.java | 45 ++--- .../ComputeResourceRegister.java | 35 ++-- .../ExperimentExecution.java | 172 ++++++++++--------- .../multitenantedairavata/GatewayRegister.java | 11 +- pom.xml | 2 +- 13 files changed, 320 insertions(+), 284 deletions(-) ----------------------------------------------------------------------
