Merge branch 'develop' into MARMOTTA-321
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/8fa40d82 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/8fa40d82 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/8fa40d82 Branch: refs/heads/develop Commit: 8fa40d828af14dc69d77d5f157b7c9abfef632ff Parents: e568642 3c31958 Author: Jakob Frank <[email protected]> Authored: Wed Oct 23 16:07:27 2013 +0200 Committer: Jakob Frank <[email protected]> Committed: Wed Oct 23 16:07:27 2013 +0200 ---------------------------------------------------------------------- build/check-rebel.root.sh | 11 +++++++ commons/marmotta-commons/pom.xml | 1 - launchers/marmotta-webapp/pom.xml | 2 +- .../backends/marmotta-backend-bigdata/pom.xml | 3 +- .../bigdata/BigDataSesame27Repository.java | 13 ++++++-- .../backend/bigdata/BigDataSesame27Sail.java | 24 ++++++++++---- platform/backends/marmotta-backend-kiwi/pom.xml | 4 +-- .../backends/marmotta-backend-memory/pom.xml | 4 +-- .../backends/marmotta-backend-native/pom.xml | 4 +-- .../ldcache/marmotta-ldcache-common/pom.xml | 4 +-- .../LinkedDataCachingWebService.java | 32 ++++++++++++------ platform/ldcache/marmotta-ldcache-file/pom.xml | 2 +- platform/ldcache/marmotta-ldcache-kiwi/pom.xml | 2 +- .../src/main/resources/META-INF/beans.xml | 28 ---------------- .../src/main/resources/kiwi-module.properties | 34 -------------------- 15 files changed, 74 insertions(+), 94 deletions(-) ----------------------------------------------------------------------
