Merge pul request 70
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6d5c632d Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6d5c632d Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6d5c632d Branch: refs/heads/develop Commit: 6d5c632d2e64af17688faa596743a7d5b1acbb04 Parents: fe6ebe9 01f8044 Author: Shameera Rathnayaka <[email protected]> Authored: Wed Nov 2 18:10:22 2016 -0400 Committer: Shameera Rathnayaka <[email protected]> Committed: Wed Nov 2 18:10:22 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 | 69 +++++++++++++---- .../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/impl/task/AuroraJobSubmission.java | 18 ++--- .../gfac/monitor/cloud/AuroraJobMonitor.java | 2 +- .../cpi/impl/SimpleOrchestratorImpl.java | 4 +- 13 files changed, 206 insertions(+), 103 deletions(-) ----------------------------------------------------------------------
