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/b3f7b256 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b3f7b256 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b3f7b256 Branch: refs/heads/master Commit: b3f7b256f731c17f067a1c74841932d63a405eea Parents: 92ddf3e 4b51e7f Author: raminder <[email protected]> Authored: Tue May 27 14:18:24 2014 -0400 Committer: raminder <[email protected]> Committed: Tue May 27 14:18:24 2014 -0400 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 8 +- .../resources/lib/experimentModel_types.cpp | 24 +++- .../main/resources/lib/experimentModel_types.h | 19 ++- .../Model/Workspace/Experiment/Types.php | 28 +++- .../client/samples/CreateLaunchExperiment.java | 2 +- .../workspace/experiment/ExperimentSummary.java | 129 +++++++++++++++++-- .../experimentModel.thrift | 5 +- .../main/resources/airavata-server.properties | 7 +- modules/distribution/server/pom.xml | 5 + .../server/src/main/assembly/bin-assembly.xml | 1 + .../airavata/gfac/server/GfacServerHandler.java | 34 +++-- .../AiravataExperimentStatusUpdator.java | 1 + .../AiravataWorkflowNodeStatusUpdator.java | 23 +--- .../gfac/local/provider/impl/LocalProvider.java | 7 - .../src/test/resources/orchestrator.properties | 2 +- modules/orchestrator/orchestrator-core/pom.xml | 23 ++-- .../orchestrator/core/gfac/GFACInstance.java | 7 +- .../core/gfac/GFacClientFactory.java | 42 ++++++ .../core/impl/EmbeddedGFACJobSubmitter.java | 83 ------------ .../core/impl/GFACEmbeddedJobSubmitter.java | 81 ++++++++++++ .../core/impl/GFACServiceJobSubmitter.java | 63 +++++++++ .../core/utils/OrchestratorUtils.java | 4 +- .../cpi/impl/SimpleOrchestratorImpl.java | 1 - .../registry/jpa/resources/WorkerResource.java | 6 +- .../jpa/utils/ThriftDataModelConversion.java | 1 + 25 files changed, 427 insertions(+), 179 deletions(-) ----------------------------------------------------------------------
