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/09/04 12:06:15 UTC

[2/2] 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/8a2fe2be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/8a2fe2be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/8a2fe2be

Branch: refs/heads/develop
Commit: 8a2fe2bec9c4ef63fb582110e2c36800412802b0
Parents: 117187d 7330202
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Wed Sep 4 12:06:06 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Wed Sep 4 12:06:06 2013 +0200

----------------------------------------------------------------------
 .../marmotta/commons/http/ETagGenerator.java    | 24 +++++--
 .../platform/core/rio/RDFHtmlWriterImpl.java    | 67 ++++++++++++--------
 .../webservices/resource/MetaWebService.java    | 59 ++++++++++-------
 .../resource/ResourceWebService.java            | 55 ++++++++++------
 .../resource/ResourceWebServiceHelper.java      | 34 +++++-----
 .../src/main/resources/templates/rdfhtml.ftl    | 51 +++++++++++----
 .../sparqlhtml/SPARQLResultsHTMLWriter.java     |  4 +-
 7 files changed, 188 insertions(+), 106 deletions(-)
----------------------------------------------------------------------