Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/adea1f5a Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/adea1f5a Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/adea1f5a Branch: refs/heads/master Commit: adea1f5a431b0ec3768c07915d3da12cf092bc45 Parents: 56a05e7 43d5235 Author: tkurz <[email protected]> Authored: Thu Nov 27 15:43:19 2014 +0100 Committer: tkurz <[email protected]> Committed: Thu Nov 27 15:43:19 2014 +0100 ---------------------------------------------------------------------- .../src/main/webapp/META-INF/jetty-web.xml | 30 ---------- .../src/main/webapp/WEB-INF/jetty-web.xml | 24 +++++--- .../marmotta/commons/vocabulary/SPARQL_SD.java | 2 +- .../src/main/webapp/META-INF/jetty-web.xml | 27 --------- .../src/main/webapp/WEB-INF/jetty-web.xml | 24 +++++--- libraries/kiwi/kiwi-loader/pom.xml | 5 ++ .../core/startup/MarmottaStartupService.java | 61 ++++++++++---------- .../marmotta/platform/core/util/CDIContext.java | 10 ++-- .../platform/core/test/base/JettyMarmotta.java | 7 ++- pom.xml | 6 ++ 10 files changed, 81 insertions(+), 115 deletions(-) ----------------------------------------------------------------------
