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/75c4cf4b Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/75c4cf4b Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/75c4cf4b Branch: refs/heads/master Commit: 75c4cf4ba1a0b1c736f010cb4ab214d631e6ad44 Parents: c292fe6 6623967 Author: Supun Nakandala <[email protected]> Authored: Thu Sep 3 15:16:38 2015 +0530 Committer: Supun Nakandala <[email protected]> Committed: Thu Sep 3 15:16:38 2015 +0530 ---------------------------------------------------------------------- .../client/samples/CreateLaunchExperiment.java | 20 +++--- .../apache/airavata/gfac/core/GFacUtils.java | 49 +++++++++++-- .../airavata/gfac/core/context/GFacContext.java | 2 +- .../gfac/core/context/ProcessContext.java | 14 +++- .../airavata/gfac/impl/GFacEngineImpl.java | 72 +++++++++++++++----- .../apache/airavata/gfac/impl/GFacWorker.java | 16 +++-- .../impl/watcher/CancelRequestWatcherImpl.java | 38 +++++++++++ .../watcher/RedeliveryRequestWatcherImpl.java | 5 +- .../gfac/monitor/email/EmailBasedMonitor.java | 22 +++--- 9 files changed, 190 insertions(+), 48 deletions(-) ----------------------------------------------------------------------
