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/7542f690 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7542f690 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7542f690 Branch: refs/heads/master Commit: 7542f69006fe819d65e0badb0cb897e196a2e0f0 Parents: c625126 9dac178 Author: msmemon Authored: Thu Sep 18 11:43:16 2014 +0200 Committer: msmemon Committed: Thu Sep 18 11:43:16 2014 +0200 ---------------------------------------------------------------------- .../client/samples/CreateLaunchExperiment.java | 14 +-- .../catalog/data/impl/ComputeResourceImpl.java | 2 +- .../airavata/gfac/server/GfacServerHandler.java | 3 + .../org/apache/airavata/gfac/Constants.java | 3 + .../airavata/gfac/core/monitor/MonitorID.java | 3 + .../gfac/gsissh/util/GFACGSISSHUtils.java | 3 +- .../airavata/gfac/monitor/HPCMonitorID.java | 28 +++++- .../monitor/impl/pull/qstat/HPCPullMonitor.java | 6 +- .../impl/push/amqp/SimpleJobFinishConsumer.java | 11 +- .../airavata/gfac/monitor/util/CommonUtils.java | 100 ++++++++++--------- .../ssh/handler/AdvancedSCPOutputHandler.java | 4 +- .../airavata/gfac/ssh/util/GFACSSHUtils.java | 4 +- .../server/OrchestratorServerHandler.java | 76 ++++++++------ .../core/context/OrchestratorContext.java | 6 +- .../apache/airavata/gsi/ssh/api/Cluster.java | 6 ++ 15 files changed, 169 insertions(+), 100 deletions(-) ----------------------------------------------------------------------