Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop
# By Sebastian Schaffert # Via Sebastian Schaffert * 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta: added configuration defaults and descriptions for clustering make cache mode configurable in triplestore and platform for clustered operation Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/3ef4c49b Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/3ef4c49b Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/3ef4c49b Branch: refs/heads/ldp Commit: 3ef4c49bd183fca7c536171f5c1cf31c8ff31e31 Parents: 0fa9754 2aa3f51 Author: Rupert Westenthaler <[email protected]> Authored: Thu Feb 13 10:36:29 2014 +0100 Committer: Rupert Westenthaler <[email protected]> Committed: Thu Feb 13 10:36:29 2014 +0100 ---------------------------------------------------------------------- .../marmotta/kiwi/caching/KiWiCacheManager.java | 59 ++++++++++++------ .../apache/marmotta/kiwi/config/CacheMode.java | 45 ++++++++++++++ .../marmotta/kiwi/config/KiWiConfiguration.java | 46 ++++++++++++++ .../core/services/cache/CachingServiceImpl.java | 65 +++++++++++++------- .../main/resources/config-defaults.properties | 3 + .../resources/config-descriptions.properties | 17 ++++- 6 files changed, 191 insertions(+), 44 deletions(-) ----------------------------------------------------------------------
