merging remote
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/cc009e3c Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/cc009e3c Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/cc009e3c Branch: refs/heads/lahiru/AIRAVATA-2065 Commit: cc009e3c6d49b98d1abbbe3dd8aceebc403a9592 Parents: 21c3e78 a3950c9 Author: scnakandala <supun.nakand...@gmail.com> Authored: Sat Aug 27 15:46:02 2016 -0400 Committer: scnakandala <supun.nakand...@gmail.com> Committed: Sat Aug 27 15:46:02 2016 -0400 ---------------------------------------------------------------------- distribution/pom.xml | 582 ----- distribution/src/main/assembly/bin-assembly.xml | 160 -- distribution/src/main/assembly/src-assembly.xml | 75 - distribution/src/main/resources/INSTALL | 30 - distribution/src/main/resources/LICENSE | 2387 ------------------ distribution/src/main/resources/NOTICE | 163 -- distribution/src/main/resources/README | 145 -- .../main/resources/bin/airavata-server-start.sh | 123 - .../main/resources/bin/airavata-server-stop.sh | 71 - .../src/main/resources/bin/airavata-server.bat | 55 - distribution/src/main/resources/bin/derby.sh | 23 - distribution/src/main/resources/bin/logo.txt | 34 - distribution/src/main/resources/bin/setenv.bat | 33 - distribution/src/main/resources/bin/setenv.sh | 46 - .../src/main/resources/bin/startNetworkServer | 189 -- .../main/resources/samples/registerSample.sh | 24 - .../src/main/resources/samples/scripts/add.sh | 21 - .../src/main/resources/samples/scripts/echo.sh | 22 - .../main/resources/samples/scripts/multiply.sh | 22 - .../main/resources/samples/scripts/subtract.sh | 22 - modules/distribution/pom.xml | 582 +++++ .../src/main/assembly/bin-assembly.xml | 160 ++ .../src/main/assembly/src-assembly.xml | 75 + modules/distribution/src/main/resources/INSTALL | 30 + modules/distribution/src/main/resources/LICENSE | 2387 ++++++++++++++++++ modules/distribution/src/main/resources/NOTICE | 163 ++ modules/distribution/src/main/resources/README | 145 ++ .../main/resources/bin/airavata-server-start.sh | 123 + .../main/resources/bin/airavata-server-stop.sh | 71 + .../src/main/resources/bin/airavata-server.bat | 55 + .../src/main/resources/bin/derby.sh | 23 + .../src/main/resources/bin/logo.txt | 34 + .../src/main/resources/bin/setenv.bat | 33 + .../src/main/resources/bin/setenv.sh | 46 + .../src/main/resources/bin/startNetworkServer | 189 ++ .../main/resources/samples/registerSample.sh | 24 + .../src/main/resources/samples/scripts/add.sh | 21 + .../src/main/resources/samples/scripts/echo.sh | 22 + .../main/resources/samples/scripts/multiply.sh | 22 + .../main/resources/samples/scripts/subtract.sh | 22 + pom.xml | 97 +- 41 files changed, 4229 insertions(+), 4322 deletions(-) ----------------------------------------------------------------------