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/bb988d37 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/bb988d37 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/bb988d37 Branch: refs/heads/master Commit: bb988d37738d4012592e1123f08ea282b85485c1 Parents: 744b546 13c67c4 Author: lahiru <[email protected]> Authored: Wed Mar 12 10:49:45 2014 -0400 Committer: lahiru <[email protected]> Committed: Wed Mar 12 10:49:45 2014 -0400 ---------------------------------------------------------------------- .../common/utils/ApplicationSettings.java | 17 ++- .../airavata/common/utils/StringUtil.java | 5 +- .../src/main/assembly/bin-assembly.xml | 18 --- .../src/main/resources/bin/airavata-server.sh | 63 +++++++--- .../resources/conf/airavata-server.properties | 3 + .../org/apache/airavata/server/ServerMain.java | 119 ++++++++++++------- 6 files changed, 144 insertions(+), 81 deletions(-) ----------------------------------------------------------------------
