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/f348ef4c Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f348ef4c Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f348ef4c Branch: refs/heads/master Commit: f348ef4c59c7f6a8c0fa347bde5b203ae17f7dde Parents: c4f3c66 f847579 Author: raminder <[email protected]> Authored: Fri Nov 14 19:30:57 2014 -0500 Committer: raminder <[email protected]> Committed: Fri Nov 14 19:30:57 2014 -0500 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 11 +- .../client/samples/CreateLaunchExperiment.java | 581 +++++++++++++++++-- .../samples/CreateLaunchExperimentUS3.java | 6 +- .../data/impl/ApplicationInterfaceImpl.java | 63 +- .../resources/AppModuleMappingResource.java | 29 +- .../resources/ApplicationInputResource.java | 6 +- .../resources/ApplicationOutputResource.java | 31 +- .../app/catalog/test/AppInterfaceTest.java | 15 +- .../server/src/main/resources/gfac-config.xml | 8 +- .../src/main/resources/gfac-config.xml | 106 ---- .../src/test/resources/gfac-config.xml | 90 --- .../gfac-bes/src/test/resources/gfac-config.xml | 26 - .../src/test/resources/gfac-config.xml | 2 +- .../gfac-ec2/src/test/resources/gfac-config.xml | 26 - .../src/test/resources/gfac-config.xml | 36 -- .../src/test/resources/gfac-config.xml | 33 -- .../src/test/resources/gfac-config.xml | 30 - .../src/test/resources/gfac-config.xml | 27 - .../airavata/gfac/monitor/HPCMonitorID.java | 2 +- .../src/test/resources/gfac-config.xml | 65 --- .../ssh/handler/AdvancedSCPOutputHandler.java | 2 +- .../gfac-ssh/src/test/resources/gfac-config.xml | 51 -- .../src/test/resources/gfac-config.xml | 80 ++- .../src/main/resources/gfac-config.xml | 106 ---- .../src/test/resources/gfac-config.xml | 90 --- .../src/test/resources/gfac-config.xml | 104 ---- .../apache/airavata/gsi/ssh/util/SSHUtils.java | 4 +- 27 files changed, 703 insertions(+), 927 deletions(-) ----------------------------------------------------------------------
