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/afc05ea3 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/afc05ea3 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/afc05ea3 Branch: refs/heads/master Commit: afc05ea3d257dc6821588a56c789fda97c47aa4f Parents: dc1898d ab23ac9 Author: msmemon <[email protected]> Authored: Mon Nov 24 15:44:55 2014 +0100 Committer: msmemon <[email protected]> Committed: Mon Nov 24 15:44:55 2014 +0100 ---------------------------------------------------------------------- .../data/impl/ApplicationDeploymentImpl.java | 34 +- .../data/resources/AppEnvironmentResource.java | 5 +- .../resources/LibraryApendPathResource.java | 4 +- .../resources/LibraryPrepandPathResource.java | 4 +- .../data/resources/ModuleLoadCmdResource.java | 4 +- .../apache/airavata/common/utils/JSONUtil.java | 9 +- .../main/resources/airavata-server.properties | 5 +- .../server/src/main/resources/gfac-config.xml | 18 ++ modules/distribution/api-server/pom.xml | 51 --- .../src/main/assembly/bin-assembly.xml | 1 - .../src/main/resources/bin/setenv.bat | 43 +++ .../api-server/src/main/resources/bin/setenv.sh | 77 +++++ modules/distribution/gfac-server/pom.xml | 309 +------------------ .../src/main/assembly/bin-assembly.xml | 4 - .../src/main/resources/bin/setenv.bat | 43 +++ .../src/main/resources/bin/setenv.sh | 77 +++++ .../distribution/orchestrator-server/pom.xml | 169 ---------- .../src/main/assembly/bin-assembly.xml | 34 -- .../src/main/resources/bin/setenv.bat | 43 +++ .../src/main/resources/bin/setenv.sh | 77 +++++ .../server/src/main/assembly/bin-assembly.xml | 157 +--------- modules/distribution/xbaya-gui/pom.xml | 214 ------------- .../airavata/gfac/core/cpi/BetterGfacImpl.java | 3 + .../gsissh/handler/GSISSHOutputHandler.java | 6 +- .../gfac/gsissh/util/GFACGSISSHUtils.java | 12 + .../gfac/ssh/handler/SSHOutputHandler.java | 10 +- .../airavata/gfac/ssh/util/GFACSSHUtils.java | 11 + .../airavata/workflow/model/wf/Workflow.java | 4 +- .../WorkflowInterpreterLaunchWindow.java | 14 +- .../gsi/ssh/impl/GSISSHAbstractCluster.java | 4 +- 30 files changed, 483 insertions(+), 963 deletions(-) ----------------------------------------------------------------------
