Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f8475797 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f8475797 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f8475797 Branch: refs/heads/master Commit: f8475797a5b3295bfe6d82caf4a3dee09a4cc598 Parents: 778f3da 6d7890d Author: shamrath <[email protected]> Authored: Fri Nov 14 17:07:49 2014 -0500 Committer: shamrath <[email protected]> Committed: Fri Nov 14 17:07:49 2014 -0500 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 11 +++- .../data/impl/ApplicationInterfaceImpl.java | 63 +++++++++++++------- .../resources/AppModuleMappingResource.java | 29 ++++++++- .../resources/ApplicationInputResource.java | 6 +- .../resources/ApplicationOutputResource.java | 31 +++++----- .../app/catalog/test/AppInterfaceTest.java | 15 ++++- .../airavata/gfac/monitor/HPCMonitorID.java | 2 +- .../apache/airavata/gsi/ssh/util/SSHUtils.java | 4 +- 8 files changed, 112 insertions(+), 49 deletions(-) ----------------------------------------------------------------------
