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/7a6d551a Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/7a6d551a Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/7a6d551a Branch: refs/heads/develop Commit: 7a6d551a16d29d539753847afefc63bc45a429d4 Parents: 17c6319 a498744 Author: Jakob Frank <[email protected]> Authored: Sat Apr 13 09:43:08 2013 +0200 Committer: Jakob Frank <[email protected]> Committed: Sat Apr 13 09:43:08 2013 +0200 ---------------------------------------------------------------------- .../src/main/webapp/WEB-INF/web.xml | 31 ++- client/marmotta-client-js-sample-webapp/pom.xml | 2 +- client/marmotta-client-php/pom.xml | 2 +- .../src/main/webapp/WEB-INF/web.xml | 30 ++- 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 ++++----------- .../core/servlet/MarmottaOptionsFilter.java | 136 ++++++ .../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 +- 24 files changed, 838 insertions(+), 565 deletions(-) ----------------------------------------------------------------------
