Merge branch 'master' into workflowEngineImprovement
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8cfe4f9e Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8cfe4f9e Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8cfe4f9e Branch: refs/heads/master Commit: 8cfe4f9eabeff73e528b38c2c47672ed54c88305 Parents: 61fa9e5 8b978c6 Author: shamrath <[email protected]> Authored: Thu Oct 9 13:27:33 2014 -0400 Committer: shamrath <[email protected]> Committed: Thu Oct 9 13:27:33 2014 -0400 ---------------------------------------------------------------------- .../client/samples/CreateLaunchExperiment.java | 18 +- .../airavata/gfac/server/GfacServerHandler.java | 6 +- .../airavata/gfac/core/cpi/BetterGfacImpl.java | 9 +- .../gfac/core/utils/GFacThreadPoolExecutor.java | 7 + .../gsissh/handler/GSISSHOutputHandler.java | 15 +- .../gfac/gsissh/util/GFACGSISSHUtils.java | 89 +++++--- .../monitor/impl/pull/qstat/HPCPullMonitor.java | 42 ++-- .../airavata/gfac/monitor/util/CommonUtils.java | 22 +- .../gfac/ssh/context/SSHAuthWrapper.java | 50 +++++ .../ssh/handler/AdvancedSCPInputHandler.java | 201 ++++++++----------- .../ssh/handler/AdvancedSCPOutputHandler.java | 53 ++--- .../airavata/gfac/ssh/util/GFACSSHUtils.java | 79 ++++++-- modules/messaging/core/pom.xml | 4 +- .../airavata/messaging/core/Consumer.java | 32 +++ .../airavata/messaging/core/Publisher.java | 9 + .../airavata/messaging/core/TestClient.java | 51 +++++ .../messaging/core/impl/RabbitMQConsumer.java | 116 +++++++++++ .../server/OrchestratorServerHandler.java | 4 +- modules/xbaya-gui/pom.xml | 10 +- .../org/apache/airavata/xbaya/XBayaEngine.java | 3 + tools/gsissh/pom.xml | 12 +- .../java/com/jcraft/jsch/ExtendedSession.java | 2 + .../com/jcraft/jsch/GSISSHIdentityFile.java | 3 +- .../airavata/gsi/ssh/api/CommandExecutor.java | 10 +- .../gsi/ssh/impl/GSISSHAbstractCluster.java | 54 +++-- .../gsi/ssh/impl/StandardOutReader.java | 3 - .../apache/airavata/gsi/ssh/util/SSHUtils.java | 12 +- 27 files changed, 614 insertions(+), 302 deletions(-) ----------------------------------------------------------------------
