You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@marmotta.apache.org by tk...@apache.org on 2013/05/16 12:31:43 UTC

[13/14] git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta into MARMOTTA-228

Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta into MARMOTTA-228


Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/f83e310b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/f83e310b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/f83e310b

Branch: refs/heads/MARMOTTA-228
Commit: f83e310b48e24ae148548c5ff5f81409e21f540e
Parents: 10aff5e adff465
Author: tkurz <tk...@apache.org>
Authored: Thu May 16 12:29:14 2013 +0200
Committer: tkurz <tk...@apache.org>
Committed: Thu May 16 12:29:14 2013 +0200

----------------------------------------------------------------------
 .../sparql/persistence/KiWiSparqlConnection.java   |    1 +
 .../marmotta/ldcache/api/LDCachingBackend.java     |    8 ++
 .../ldcache/backend/file/LDCachingFileBackend.java |   14 +++
 .../backend/file/test/LDCacheBackendTest.java      |    6 +
 .../ldcache/backend/kiwi/LDCachingKiWiBackend.java |   21 ++++
 .../backend/kiwi/test/LDCacheBackendTest.java      |    6 +
 .../apache/marmotta/ldcache/services/LDCache.java  |   12 +++
 .../provider/mediawiki/MediawikiProvider.java      |    2 +-
 libraries/ldpath/ldpath-backend-sesame/pom.xml     |    6 -
 .../core/api/config/ConfigurationService.java      |    3 +
 .../services/config/ConfigurationServiceImpl.java  |   19 ++++-
 .../core/startup/MarmottaStartupService.java       |    2 +
 .../model/filter/MarmottaNotCachedFilter.java      |   75 +++++++++++++++
 13 files changed, 166 insertions(+), 9 deletions(-)
----------------------------------------------------------------------