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/10/28 10:51:17 UTC
[3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-marmotta into develop
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta 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/216a98de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/216a98de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/216a98de
Branch: refs/heads/develop
Commit: 216a98de42284ee9ee0e9b619b3764075bd9d1bd
Parents: dcff255 ae6559f
Author: tkurz <tk...@apache.org>
Authored: Mon Oct 28 10:50:51 2013 +0100
Committer: tkurz <tk...@apache.org>
Committed: Mon Oct 28 10:50:51 2013 +0100
----------------------------------------------------------------------
build/check-rebel.root.sh | 11 -
build/scripts/check-parent-pom.sh | 19 +
build/scripts/check-rebel.root.sh | 11 +
.../commons/nio/watch/AbstractTreeWatcher.java | 250 +++++++
.../commons/nio/watch/SimpleTreeWatcher.java | 78 +++
.../apache/marmotta/commons/util/HashUtils.java | 86 ++-
.../backend/sesame/AbstractSesameBackend.java | 15 +-
.../ContextAwareSesameConnectionBackend.java | 47 ++
.../backend/sesame/SesameConnectionBackend.java | 28 +-
.../marmotta/ldpath/model/programs/Program.java | 32 +-
.../at/newmedialab/ldpath/parser/rdfpath.jj | 10 +-
platform/backends/pom.xml | 2 +-
platform/ldcache/pom.xml | 2 +-
platform/marmotta-core/pom.xml | 5 +
.../core/api/importer/ImportWatchService.java | 22 +-
.../services/importer/ImportServiceImpl.java | 6 +-
.../importer/ImportWatchServiceImpl.java | 701 +++++++++++++------
.../src/main/resources/templates/admin.ftl | 56 --
.../resources/web/public/style/blue/style.css | 55 +-
.../resources/web/public/style/white/style.css | 54 ++
20 files changed, 1157 insertions(+), 333 deletions(-)
----------------------------------------------------------------------