You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2015/04/08 18:19:04 UTC
[07/15] airavata git commit: Merge branch 'master' into
emailMonitoring
Merge branch 'master' into emailMonitoring
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/95fae20b
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/95fae20b
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/95fae20b
Branch: refs/heads/master
Commit: 95fae20b18f562c2d0bed46e58924516c3eccd67
Parents: 9f1fa2d 2265395
Author: shamrath <sh...@gmail.com>
Authored: Tue Apr 7 22:31:55 2015 -0400
Committer: shamrath <sh...@gmail.com>
Committed: Tue Apr 7 22:31:55 2015 -0400
----------------------------------------------------------------------
.../AiravataExperimentStatusUpdator.java | 16 +-
.../airavata-cpp-sdk/pom.xml | 3 -
.../airavata-php-sdk/pom.xml | 3 -
.../airavata-python-sdk/pom.xml | 3 -
.../client/samples/CreateLaunchExperiment.java | 2 +-
.../data/impl/ApplicationDeploymentImpl.java | 5 +-
modules/commons/utils/pom.xml | 6 +-
.../airavata/common/utils/ServerSettings.java | 13 +-
.../main/resources/airavata-server.properties | 3 +-
.../test/resources/airavata-server.properties | 30 +-
modules/distribution/client/java/pom.xml | 236 +-----------
modules/distribution/release/pom.xml | 3 -
modules/distribution/server/pom.xml | 22 +-
modules/distribution/xbaya-gui/pom.xml | 18 -
.../airavata/gfac/server/GfacServerHandler.java | 24 +-
.../airavata/gfac/core/cpi/BetterGfacImpl.java | 6 +-
.../gfac/core/utils/GFacThreadPoolExecutor.java | 2 +
.../airavata/gfac/core/utils/GFacUtils.java | 9 +-
.../gfac/core/utils/InputHandlerWorker.java | 4 +-
.../gfac/ssh/security/TokenizedSSHAuthInfo.java | 2 +-
modules/integration-tests/pom.xml | 13 -
modules/messaging/client/pom.xml | 9 -
.../core/impl/RabbitMQTaskLaunchConsumer.java | 21 +
.../core/impl/RabbitMQTaskLaunchPublisher.java | 14 +-
modules/orchestrator/orchestrator-core/pom.xml | 19 -
.../cpi/impl/SimpleOrchestratorImpl.java | 1 -
.../test-suite/multi-tenanted-airavata/README | 59 +++
.../ApplicationRegister.java | 56 +--
.../ComputeResourceRegister.java | 50 ++-
.../ExperimentExecution.java | 381 ++++++++++++-------
.../FrameworkBootstrapping.java | 106 +++++-
.../multitenantedairavata/FrameworkSetup.java | 10 +
.../multitenantedairavata/GatewayRegister.java | 55 +--
.../multitenantedairavata/LoadTester.java | 50 ---
.../utils/TestFrameworkConstants.java | 10 +-
.../main/resources/airavata-client.properties | 4 +-
.../main/resources/test-framework.properties | 18 +-
modules/workflow-model/workflow-engine/pom.xml | 5 -
modules/xbaya-gui/pom.xml | 32 --
pom.xml | 78 +---
samples/java-client/experiment/pom.xml | 72 +---
tools/gsissh-cli-tools/pom.xml | 56 ---
tools/gsissh/pom.xml | 8 -
43 files changed, 645 insertions(+), 892 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/95fae20b/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/95fae20b/modules/configuration/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------