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/893156a8 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/893156a8 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/893156a8 Branch: refs/heads/master Commit: 893156a89fb0b8935102c5a68d734caf32f0886c Parents: cead776 4d6dbbe Author: Saminda Wijeratne <[email protected]> Authored: Tue Mar 4 20:26:00 2014 -0500 Committer: Saminda Wijeratne <[email protected]> Committed: Tue Mar 4 20:26:00 2014 -0500 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 50 ++++++++----- .../client/samples/CreateLaunchExperiment.java | 5 ++ .../job/monitor/AiravataJobStatusUpdator.java | 74 ++++++++++---------- .../gfac/handler/GramDirectorySetupHandler.java | 7 +- .../gfac/handler/GridFTPInputHandler.java | 5 +- .../gfac/handler/GridFTPOutputHandler.java | 5 +- .../gfac/handler/SCPDirectorySetupHandler.java | 9 ++- .../airavata/gfac/handler/SCPInputHandler.java | 7 +- .../airavata/gfac/handler/SCPOutputHandler.java | 3 + .../gfac/provider/impl/GSISSHProvider.java | 18 +++-- .../gfac/provider/impl/GramProvider.java | 23 ++++-- .../apache/airavata/gfac/utils/GFacUtils.java | 16 +++++ .../gfac/utils/GramJobSubmissionListener.java | 3 +- 13 files changed, 155 insertions(+), 70 deletions(-) ----------------------------------------------------------------------
