You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2013/10/24 17:09:23 UTC
[02/30] git commit: Merge remote-tracking branch 'origin/develop'
into develop
Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/8d6dd726
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/8d6dd726
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/8d6dd726
Branch: refs/heads/MARMOTTA-345
Commit: 8d6dd726d241967eb23eca46a8666962d2969631
Parents: c7a5852 6fd4e02
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Wed Oct 16 10:57:23 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Wed Oct 16 10:57:23 2013 +0200
----------------------------------------------------------------------
.../src/main/webapp/WEB-INF/web.xml | 96 +---
.../src/test/resources/test-config.properties | 5 +-
.../src/main/webapp/WEB-INF/web.xml | 92 +---
.../src/main/webapp/WEB-INF/web.xml | 91 +---
.../src/test/resources/test-config.properties | 3 -
libraries/kiwi/kiwi-loader/pom.xml | 147 +++++
.../apache/marmotta/kiwi/loader/KiWiLoader.java | 541 +++++++++++++++++++
.../marmotta/kiwi/loader/KiWiLoaderTest.java | 219 ++++++++
.../src/test/resources/logback-test.xml | 28 +
libraries/kiwi/pom.xml | 1 +
parent/pom.xml | 8 +-
.../core/api/triplestore/ContextService.java | 27 +-
.../core/jndi/MarmottaJndiListener.java | 8 +-
.../config/ConfigurationServiceImpl.java | 1 -
.../importer/ImportWatchServiceImpl.java | 70 +--
.../triplestore/ContextServiceImpl.java | 38 +-
.../core/servlet/MarmottaH2ConsoleFilter.java | 11 +-
.../core/servlet/MarmottaOptionsFilter.java | 19 +-
.../core/servlet/MarmottaPostStartupFilter.java | 2 +
.../core/servlet/MarmottaPreStartupFilter.java | 13 +-
.../servlet/MarmottaPreStartupListener.java | 15 +-
.../core/servlet/MarmottaResourceFilter.java | 4 +
.../core/webservices/io/ImportWebService.java | 68 ++-
.../webservices/resource/MetaWebService.java | 108 ++--
.../main/resources/config-defaults.properties | 3 -
.../resources/config-descriptions.properties | 21 +-
.../webservices/SparqlWebServiceTest.java | 3 +-
27 files changed, 1188 insertions(+), 454 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/8d6dd726/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java
----------------------------------------------------------------------