You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by rp...@apache.org on 2013/06/14 23:25:27 UTC
[2/2] 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/83cc90f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/83cc90f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/83cc90f5
Branch: refs/heads/develop
Commit: 83cc90f51e8c76b2d5980b6e1c04ac80462923ab
Parents: 2ca77e7 64cfc30
Author: Raffaele Palmieri <rp...@apache.org>
Authored: Fri Jun 14 19:04:06 2013 +0200
Committer: Raffaele Palmieri <rp...@apache.org>
Committed: Fri Jun 14 19:04:06 2013 +0200
----------------------------------------------------------------------
launchers/marmotta-webapp/pom.xml | 4 --
.../kiwi/persistence/KiWiConnection.java | 39 ++++++-----
.../marmotta/kiwi/sail/KiWiSailConnection.java | 6 +-
.../persistence/mysql/statements.properties | 2 +-
.../persistence/pgsql/create_base_tables.sql | 10 +++
.../servlet/MarmottaPreStartupListener.java | 21 +++++-
.../model/filter/LDCacheIgnoreFilter.java | 15 +++++
.../endpoint/LinkedDataEndpointServiceImpl.java | 2 +-
.../services/ldcache/LDCacheSailProvider.java | 70 +++++++++++++++++++-
.../LinkedDataCachingWebService.java | 10 ++-
.../resources/web/admin/widgets/lmf_ldcache.js | 26 +++++---
11 files changed, 162 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/83cc90f5/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
----------------------------------------------------------------------