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/fea3325f Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/fea3325f Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/fea3325f Branch: refs/heads/master Commit: fea3325f77abf822b0d4c74682c9be9d512e3ed0 Parents: 6fb6644 2bf83dd Author: raminder <[email protected]> Authored: Wed May 13 16:39:52 2015 -0400 Committer: raminder <[email protected]> Committed: Wed May 13 16:39:52 2015 -0400 ---------------------------------------------------------------------- .../AiravataExperimentStatusUpdator.java | 2 +- modules/distribution/new-dist/pom.xml | 62 +- .../main/assembly/airavata-common-component.xml | 100 +++ .../src/main/assembly/api-server-assembly.xml | 147 +--- .../src/main/assembly/api-server-component.xml | 8 +- .../new-dist/src/main/assembly/src-assembly.xml | 2 +- modules/distribution/pom.xml | 2 +- .../gfac/states/GfacExperimentState.java | 88 --- .../gfac/states/GfacExperimentStatus.java | 516 -------------- .../airavata/gfac/states/GfacHandlerState.java | 67 -- .../gfac/states/gfacDataModelConstants.java | 59 -- .../gfac/bes/provider/impl/BESProvider.java | 2 +- .../airavata/gfac/core/cpi/BetterGfacImpl.java | 98 ++- .../gfac/core/states/GfacExperimentState.java | 25 +- .../airavata/gfac/core/utils/GFacUtils.java | 668 +------------------ .../gsissh/provider/impl/GSISSHProvider.java | 13 +- .../gfac/local/provider/impl/LocalProvider.java | 4 +- .../handlers/GridPullMonitorHandler.java | 4 +- .../gfac/ssh/provider/impl/SSHProvider.java | 68 +- .../gfacDataModel.thrift | 1 + .../server/OrchestratorServerHandler.java | 148 ++-- .../core/impl/GFACPassiveJobSubmitter.java | 55 +- .../registry/jpa/impl/ExperimentRegistry.java | 54 +- .../gsi/ssh/api/job/SlurmJobConfiguration.java | 2 +- .../gsi/ssh/api/job/SlurmOutputParser.java | 7 +- 25 files changed, 340 insertions(+), 1862 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/fea3325f/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/provider/impl/BESProvider.java ----------------------------------------------------------------------
