Merge branch 'master' into StoreGFacsJobCount
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d004df14 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d004df14 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d004df14 Branch: refs/heads/master Commit: d004df145c9e9be964c5028fca7744e7635fc4eb Parents: 78ad2ef 68e81ef Author: shamrath <[email protected]> Authored: Thu Sep 11 21:36:59 2014 -0400 Committer: shamrath <[email protected]> Committed: Thu Sep 11 21:36:59 2014 -0400 ---------------------------------------------------------------------- .../airavata/common/utils/ServerSettings.java | 202 ++++++++++--------- .../server/src/main/resources/PBSTemplate.xslt | 2 +- .../src/main/resources/SLURMTemplate.xslt | 1 + .../main/resources/airavata-server.properties | 8 +- .../airavata/gfac/core/monitor/MonitorID.java | 4 +- .../gfac/gsissh/util/GFACGSISSHUtils.java | 3 + .../monitor/impl/pull/qstat/HPCPullMonitor.java | 40 +++- .../impl/push/amqp/SimpleJobFinishConsumer.java | 76 +++++++ .../airavata/gfac/monitor/util/CommonUtils.java | 6 +- .../airavata/gfac/ssh/util/GFACSSHUtils.java | 3 + .../airavata/gsi/ssh/api/job/JobDescriptor.java | 7 + .../gsi/ssh/api/job/SlurmOutputParser.java | 4 +- .../gsi/ssh/impl/StandardOutReader.java | 4 +- .../gsi/ssh/impl/SystemCommandOutput.java | 1 + .../main/resources/schemas/PBSJobDescriptor.xsd | 1 + 15 files changed, 252 insertions(+), 110 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/d004df14/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java ----------------------------------------------------------------------
