Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7937d1c3 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7937d1c3 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7937d1c3 Branch: refs/heads/develop Commit: 7937d1c394a36fcc9f4aede158b63ab05fd01b32 Parents: 926a01a 4cafd7a Author: scnakandala <[email protected]> Authored: Thu Nov 3 12:02:39 2016 -0400 Committer: scnakandala <[email protected]> Committed: Thu Nov 3 12:02:39 2016 -0400 ---------------------------------------------------------------------- modules/cloud/aurora-client/pom.xml | 9 +- .../client/AuroraSchedulerClientFactory.java | 45 ++++- .../cloud/aurora/client/AuroraThriftClient.java | 28 +-- .../aurora/client/bean/GetJobsResponseBean.java | 10 + .../cloud/aurora/sample/AuroraClientSample.java | 80 ++++---- .../aurora/util/AuroraThriftClientUtil.java | 71 +++++-- .../airavata/cloud/aurora/util/Constants.java | 5 +- .../main/resources/aurora-scheduler.properties | 4 +- .../airavata/common/utils/ServerSettings.java | 26 +++ .../main/resources/airavata-server.properties | 9 + .../gfac/core/DataStagingException.java | 43 ---- .../gfac/core/cluster/RemoteCluster.java | 33 ++-- .../gfac/core/cluster/SessionConsumer.java | 28 --- .../airavata/gfac/impl/BESRemoteCluster.java | 9 +- .../airavata/gfac/impl/HPCRemoteCluster.java | 37 ++-- .../airavata/gfac/impl/LocalRemoteCluster.java | 26 +-- .../org/apache/airavata/gfac/impl/SSHUtils.java | 198 +++++++++---------- .../airavata/gfac/impl/task/ArchiveTask.java | 8 +- .../gfac/impl/task/AuroraJobSubmission.java | 25 ++- .../gfac/impl/task/BESJobSubmissionTask.java | 5 +- .../airavata/gfac/impl/task/DataStageTask.java | 13 +- .../gfac/impl/task/EnvironmentSetupTask.java | 4 +- .../gfac/impl/task/SCPDataStageTask.java | 31 +-- .../gfac/impl/task/utils/StreamData.java | 37 ++-- .../gfac/monitor/cloud/AuroraJobMonitor.java | 2 +- .../cpi/impl/SimpleOrchestratorImpl.java | 4 +- 26 files changed, 401 insertions(+), 389 deletions(-) ----------------------------------------------------------------------
