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/67ec953d Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/67ec953d Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/67ec953d Branch: refs/heads/develop Commit: 67ec953dc72ec69482de5cee9bfaaacc5e8540a0 Parents: 487e314 f3f2dc3 Author: Sebastian Schaffert <[email protected]> Authored: Mon Feb 3 13:07:55 2014 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Mon Feb 3 13:07:55 2014 +0100 ---------------------------------------------------------------------- .../marmotta-rio-rss/pom.xml | 1 - launchers/marmotta-webapp/pom.xml | 57 +++++++++++++++++--- .../marmotta-webapp/src/deb/control/control | 8 +++ .../marmotta-webapp/src/deb/control/postinst | 8 +++ .../marmotta-webapp/src/deb/control/postrm | 18 +++++++ .../marmotta-webapp/src/deb/control/preinst | 5 ++ launchers/marmotta-webapp/src/deb/control/prerm | 4 ++ .../marmotta-webapp/src/deb/home/marmotta.txt | 2 + .../marmotta-webapp/src/deb/tomcat/marmotta.xml | 10 ++++ .../marmotta/kiwi/persistence/KiWiDialect.java | 2 +- loader/marmotta-loader-berkeley/pom.xml | 1 + loader/marmotta-loader-hbase/pom.xml | 2 +- loader/marmotta-loader-kiwi/pom.xml | 2 +- parent/pom.xml | 53 ++++++++++++++---- pom.xml | 4 +- 15 files changed, 154 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
