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/04/12 10:57:44 UTC
[2/5] git commit: Merge branch 'master' into develop
Merge branch 'master' 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/b93049f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/b93049f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/b93049f2
Branch: refs/heads/master
Commit: b93049f26d0364f7d772de4409f2b996cb6f1268
Parents: 849aa0c 8ad5ef2
Author: Sergio Fernández <wi...@apache.org>
Authored: Thu Apr 11 15:18:52 2013 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Thu Apr 11 15:18:52 2013 +0200
----------------------------------------------------------------------
client/marmotta-client-js-sample-webapp/pom.xml | 2 +-
client/marmotta-client-php/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-mapdb/pom.xml | 2 +-
.../core/api/templating/AdminInterfaceService.java | 55 +++
.../core/api/templating/TemplatingService.java | 58 ++--
.../platform/core/filters/TemplatingFilter.java | 27 +-
.../platform/core/rio/RDFHtmlWriterImpl.java | 16 +-
.../templating/AdminTemplatingServiceImpl.java | 283 ++++++++++++
.../core/services/templating/TemplatingHelper.java | 93 ----
.../services/templating/TemplatingServiceImpl.java | 348 ++++-----------
.../webservices/resource/ContentWebService.java | 14 +-
.../webservices/resource/InspectionWebService.java | 80 ++--
.../core/webservices/resource/MetaWebService.java | 18 +-
.../webservices/resource/ResourceWebService.java | 54 ++-
.../resource/ResourceWebServiceHelper.java | 20 +-
.../src/main/resources/templates/404.ftl | 6 +-
.../sparql/services/sparql/SparqlServiceImpl.java | 54 +++-
.../services/sparql/SparqlWritersHelper.java | 54 ---
.../sparqlhtml/SPARQLBooleanHTMLWriter.java | 1 -
.../sparqlhtml/SPARQLResultsHTMLWriter.java | 13 +-
.../sparql/webservices/SparqlWebService.java | 6 +-
21 files changed, 649 insertions(+), 557 deletions(-)
----------------------------------------------------------------------