You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by rw...@apache.org on 2014/02/26 12:43:58 UTC
[09/18] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/marmotta into develop
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop
# By Jakob Frank (3) and others
# Via Sergio Fernández
* 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta:
removed andy from the root pom
MARMOTTA-437: replaced RDFFormat.forFileName / forMIMEType with their Rio-successors.
MARMOTTA-189: Added js-parsable timestamps for versions in the template.
Improved error log on ambiguous marmotta backends in the classpath
support loading a directory of archives
added 7z support to loader
some more code improvements
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/0fa97540
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/0fa97540
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/0fa97540
Branch: refs/heads/develop
Commit: 0fa9754007f7bc86bec55e31d2d21a477f2b98b0
Parents: 26ed0bf 99254fe
Author: Rupert Westenthaler <ru...@gmail.com>
Authored: Wed Feb 12 15:24:55 2014 +0100
Committer: Rupert Westenthaler <ru...@gmail.com>
Committed: Wed Feb 12 15:24:55 2014 +0100
----------------------------------------------------------------------
.../commons/sesame/rio/ical/ICalFormat.java | 7 +-
.../commons/sesame/rio/rss/AtomFormat.java | 4 -
.../commons/sesame/rio/rss/RSSFormat.java | 4 -
.../commons/sesame/rio/vcard/VCardFormat.java | 3 -
.../persistence/KiWiReasoningConnection.java | 11 +-
.../persistence/KiWiSparqlConnection.java | 11 +-
.../kiwi/caching/TripleExternalizer.java | 24 +--
.../kiwi/persistence/KiWiConnection.java | 23 +--
.../KiWiRepositoryConnectionTest.java | 7 +
.../ldpath/backend/file/FileBackend.java | 13 +-
.../marmotta/loader/core/MarmottaLoader.java | 161 ++++++++++++++-----
.../marmotta/loader/rio/GeonamesFormat.java | 4 -
.../marmotta/loader/core/test/ArchiveTest.java | 3 +-
.../loader/core/test/GeonamesParserTest.java | 2 +-
.../loader/core/test/LoaderTestBase.java | 2 +-
.../src/test/resources/demo-data.7z | Bin 0 -> 1423 bytes
.../platform/core/rio/RDFHtmlFormat.java | 3 -
.../services/triplestore/SesameServiceImpl.java | 5 +
.../core/webservices/io/ExportWebService.java | 37 ++---
.../versioning/io/HtmlVersionSerializer.java | 14 +-
pom.xml | 6 -
21 files changed, 214 insertions(+), 130 deletions(-)
----------------------------------------------------------------------