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/ffcaea35 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ffcaea35 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ffcaea35 Branch: refs/heads/gfac_appcatalog_int Commit: ffcaea354e9c3d3ff7fccbcf69130fd0699715c3 Parents: 91721d4 8cbb2d1 Author: raminder <[email protected]> Authored: Fri Nov 7 13:55:37 2014 -0500 Committer: raminder <[email protected]> Committed: Fri Nov 7 13:55:37 2014 -0500 ---------------------------------------------------------------------- .../org/apache/airavata/gfac/Constants.java | 2 -- .../handler/GSISSHDirectorySetupHandler.java | 30 +++++++++++--------- .../gfac/gsissh/handler/GSISSHInputHandler.java | 11 +++---- .../gsissh/handler/GSISSHOutputHandler.java | 10 ++----- .../gsissh/provider/impl/GSISSHProvider.java | 13 +++++---- .../gsissh/security/GSISecurityContext.java | 2 -- .../gfac/gsissh/util/GFACGSISSHUtils.java | 2 +- .../impl/GSISSHProviderTestWithMyProxyAuth.java | 2 +- .../airavata/gfac/monitor/HPCMonitorID.java | 15 +++------- .../monitor/impl/pull/qstat/HPCPullMonitor.java | 15 ++++++---- .../impl/pull/qstat/ResourceConnection.java | 9 ++++-- .../airavata/gfac/monitor/util/CommonUtils.java | 15 ++-------- .../ssh/handler/AdvancedSCPInputHandler.java | 4 +-- .../ssh/handler/AdvancedSCPOutputHandler.java | 2 +- .../ssh/handler/SSHDirectorySetupHandler.java | 6 ++-- .../gfac/ssh/handler/SSHInputHandler.java | 9 ++---- .../gfac/ssh/handler/SSHOutputHandler.java | 7 ++--- .../gfac/ssh/provider/impl/SSHProvider.java | 12 ++++---- .../gfac/ssh/security/SSHSecurityContext.java | 2 -- .../airavata/gfac/ssh/util/GFACSSHUtils.java | 6 ++-- .../services/impl/BigRed2TestWithSSHAuth.java | 2 +- .../impl/SSHProviderTestWithSSHAuth.java | 2 +- 22 files changed, 81 insertions(+), 97 deletions(-) ----------------------------------------------------------------------
