Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/2bda338c Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/2bda338c Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/2bda338c Branch: refs/heads/develop Commit: 2bda338c6b98b40e84a3a3014dc3bf6cb5790192 Parents: 7275fc2 5f1c39c Author: Sebastian Schaffert <[email protected]> Authored: Tue Jan 7 18:23:47 2014 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Tue Jan 7 18:23:47 2014 +0100 ---------------------------------------------------------------------- launchers/marmotta-installer/assembly.xml | 8 +- launchers/marmotta-installer/pom.xml | 4 + .../src/main/resources/installer/standalone.xml | 8 ++ .../src/main/resources/unix/shutdown.sh | 24 ++++++ .../src/main/resources/unix/startup.sh | 24 ++++++ .../config/ConfigurationServiceImpl.java | 91 +++++++++++++++----- 6 files changed, 129 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/2bda338c/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java ----------------------------------------------------------------------
