You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/11/28 20:36:54 UTC
[6/6] 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/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/5a6e37ab
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/5a6e37ab
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/5a6e37ab
Branch: refs/heads/develop
Commit: 5a6e37abd85c1bc3880096f275476b32f7fcb9c7
Parents: 1154a3d 74c2c7d
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Thu Nov 28 20:35:59 2013 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Thu Nov 28 20:35:59 2013 +0100
----------------------------------------------------------------------
commons/pom.xml | 3 +
commons/sesame-contextaware/pom.xml | 54 +++
.../sesame/contextaware/ContextAwareSail.java | 47 ++
.../ContextAwareSailConnection.java | 79 +++
.../commons/sesame/AbstractContextTest.java | 108 +++++
.../contextaware/ContextAwareSailTest.java | 195 ++++++++
commons/sesame-transactions/pom.xml | 149 ++++++
.../transactions/api/TransactionListener.java | 52 ++
.../transactions/api/TransactionalSail.java | 60 +++
.../api/TransactionalSailConnection.java | 45 ++
.../transactions/model/TransactionData.java | 122 +++++
.../sail/KiWiTransactionalConnection.java | 167 +++++++
.../sail/KiWiTransactionalSail.java | 104 ++++
.../TransactionalSailConnectionWrapper.java | 59 +++
.../wrapper/TransactionalSailWrapper.java | 83 ++++
.../marmotta/kiwi/test/TransactionTest.java | 202 ++++++++
.../src/test/resources/logback.xml | 30 ++
.../apache/marmotta/kiwi/test/demo-data.foaf | 70 +++
.../apache/marmotta/kiwi/test/srfg-ontology.rdf | 126 +++++
commons/sesame-tripletable/pom.xml | 88 ++++
.../commons/sesame/tripletable/ByteArray.java | 63 +++
.../commons/sesame/tripletable/IntArray.java | 175 +++++++
.../commons/sesame/tripletable/TripleTable.java | 478 +++++++++++++++++++
.../sesame/tripletable/TripleTableTest.java | 128 +++++
launchers/marmotta-webapp/pom.xml | 2 +-
libraries/kiwi/kiwi-contextaware/pom.xml | 49 --
.../kiwi/contextaware/ContextAwareSail.java | 47 --
.../ContextAwareSailConnection.java | 79 ---
libraries/kiwi/kiwi-reasoner/pom.xml | 4 +-
.../kiwi/reasoner/engine/ReasoningEngine.java | 8 +-
.../kiwi/reasoner/sail/KiWiReasoningSail.java | 5 +-
.../test/engine/ReasoningEngineTest.java | 6 +-
.../reasoner/test/sail/ReasoningSailTest.java | 2 +-
.../KiWiRDFSchemaRepositoryConnectionTest.java | 2 +-
libraries/kiwi/kiwi-transactions/pom.xml | 155 ------
.../transactions/api/TransactionListener.java | 52 --
.../transactions/api/TransactionalSail.java | 60 ---
.../api/TransactionalSailConnection.java | 45 --
.../transactions/model/TransactionData.java | 122 -----
.../sail/KiWiTransactionalConnection.java | 167 -------
.../sail/KiWiTransactionalSail.java | 104 ----
.../TransactionalSailConnectionWrapper.java | 59 ---
.../wrapper/TransactionalSailWrapper.java | 83 ----
.../marmotta/kiwi/test/TransactionTest.java | 216 ---------
.../src/test/resources/logback.xml | 30 --
.../apache/marmotta/kiwi/test/demo-data.foaf | 70 ---
.../apache/marmotta/kiwi/test/srfg-ontology.rdf | 126 -----
libraries/kiwi/kiwi-triplestore/pom.xml | 2 +-
.../marmotta/kiwi/caching/KiWiQueryCache.java | 3 +-
.../kiwi/persistence/KiWiConnection.java | 4 +-
.../apache/marmotta/kiwi/sail/KiWiStore.java | 3 +-
.../marmotta/kiwi/sail/KiWiValueFactory.java | 2 +-
libraries/kiwi/kiwi-tripletable/pom.xml | 87 ----
.../marmotta/kiwi/model/caching/ByteArray.java | 63 ---
.../marmotta/kiwi/model/caching/IntArray.java | 175 -------
.../kiwi/model/caching/TripleTable.java | 478 -------------------
.../kiwi/model/caching/TripleTableTest.java | 127 -----
libraries/kiwi/kiwi-versioning/pom.xml | 2 +-
.../kiwi/versioning/api/VersioningSail.java | 2 +-
.../marmotta/kiwi/versioning/model/Version.java | 2 +-
.../versioning/sail/KiWiVersionListener.java | 4 +-
.../versioning/sail/KiWiVersioningSail.java | 8 +-
.../versioning/test/SnapshotRepositoryTest.java | 2 +-
.../test/VersioningRepositoryTest.java | 3 +-
libraries/kiwi/pom.xml | 3 -
.../ldcache/ldcache-backend-ehcache/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-kiwi/pom.xml | 2 +-
.../LDCachingSailRepositoryConnection.java | 2 +-
parent/pom.xml | 14 +-
.../backends/marmotta-backend-bigdata/pom.xml | 4 +-
platform/backends/marmotta-backend-http/pom.xml | 4 +-
.../backends/marmotta-backend-memory/pom.xml | 2 +-
.../backends/marmotta-backend-native/pom.xml | 2 +-
.../backends/marmotta-backend-sparql/pom.xml | 4 +-
platform/marmotta-core/pom.xml | 2 +-
.../triplestore/TransactionalSailProvider.java | 4 +-
.../services/triplestore/SesameServiceImpl.java | 9 +-
.../src/main/resources/templates/admin.ftl | 2 +-
.../resources/web/public/style/blue/style.css | 18 +-
.../services/ReasoningSailProvider.java | 18 +-
.../sparql/webservices/SparqlWebService.java | 28 +-
.../services/VersioningSailProvider.java | 25 +-
82 files changed, 2794 insertions(+), 2498 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/5a6e37ab/parent/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/5a6e37ab/platform/marmotta-core/pom.xml
----------------------------------------------------------------------