You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2014/06/24 20:05:51 UTC
[4/5] git commit: Merge branch 'zk-work'
Merge branch 'zk-work'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/34816536
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/34816536
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/34816536
Branch: refs/heads/master
Commit: 34816536df1c384aca6bd4d39bc0f6c778c1daa0
Parents: f723d49 e86504a
Author: lahiru <la...@apache.org>
Authored: Tue Jun 24 14:04:11 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Tue Jun 24 14:04:11 2014 -0400
----------------------------------------------------------------------
airavata-api/airavata-api-server/pom.xml | 6 +
.../server/handler/AiravataServerHandler.java | 94 ++-
.../handler/ApplicationCatalogHandler.java | 2 +-
.../airavata/api/server/util/Constants.java | 2 -
.../client/samples/CreateLaunchExperiment.java | 226 ++-----
.../airavataAPI.thrift | 1 +
modules/commons/utils/pom.xml | 12 +-
.../airavata/common/utils/AiravataZKUtils.java | 59 ++
.../apache/airavata/common/utils/Constants.java | 15 +
.../main/resources/airavata-server.properties | 22 +-
modules/distribution/server/pom.xml | 6 +
.../server/src/main/assembly/bin-assembly.xml | 3 +-
modules/gfac/airavata-gfac-service/pom.xml | 4 +-
.../apache/airavata/gfac/server/GfacServer.java | 11 +-
.../airavata/gfac/server/GfacServerHandler.java | 102 ++-
.../apache/airavata/gfac/util/Constants.java | 26 -
modules/gfac/gfac-core/pom.xml | 6 +
.../gfac/core/context/JobExecutionContext.java | 3 +-
.../airavata/gfac/core/cpi/BetterGfacImpl.java | 657 +++++++++++++++++++
.../apache/airavata/gfac/core/cpi/GFacImpl.java | 7 +-
.../core/monitor/GfacInternalStatusUpdator.java | 109 +++
.../airavata/gfac/core/monitor/MonitorID.java | 6 +-
.../state/GfacExperimentStateChangeRequest.java | 71 ++
.../gfac/core/provider/AbstractProvider.java | 6 +-
.../airavata/gfac/core/utils/GFacUtils.java | 21 +
.../gfac/core/utils/GfacExperimentState.java | 81 +++
.../generate-gfac-stubs.sh | 2 +
.../gfacDataModel.thrift | 55 ++
.../orchestrator/server/OrchestratorServer.java | 1 +
.../server/OrchestratorServerHandler.java | 142 +++-
.../util/OrchestratorRecoveryHandler.java | 107 +++
modules/orchestrator/orchestrator-core/pom.xml | 6 +
.../core/context/OrchestratorContext.java | 15 +
.../core/gfac/GFacClientFactory.java | 2 +-
.../core/impl/GFACServiceJobSubmitter.java | 80 ++-
.../cpi/impl/AbstractOrchestrator.java | 14 +
.../cpi/impl/SimpleOrchestratorImpl.java | 1 +
37 files changed, 1737 insertions(+), 246 deletions(-)
----------------------------------------------------------------------