Merge branch 'develop' into MARMOTTA-450
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/cebdd640 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/cebdd640 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/cebdd640 Branch: refs/heads/MARMOTTA-450 Commit: cebdd640424d6f50b3f2552d17d668b8ec037381 Parents: b07ed13 d5b0c6d Author: Sebastian Schaffert <[email protected]> Authored: Mon Mar 17 09:53:25 2014 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Mon Mar 17 09:53:25 2014 +0100 ---------------------------------------------------------------------- launchers/marmotta-webapp/pom.xml | 3 +- platform/backends/marmotta-backend-http/pom.xml | 2 +- platform/marmotta-core/pom.xml | 4 - .../core/exception/HttpErrorException.java | 107 +++++ .../core/jaxrs/HttpErrorExceptionMapper.java | 91 ++++ .../jaxrs/MarmottaImportExceptionMapper.java | 1 - .../servlet/MarmottaPreStartupListener.java | 10 +- .../webservices/resource/ContentWebService.java | 83 ++-- .../webservices/resource/MetaWebService.java | 194 ++++----- .../resource/ResourceWebService.java | 282 ++++++------ .../resource/ResourceWebServiceHelper.java | 65 +-- .../main/resources/config-defaults.properties | 28 +- .../src/main/resources/templates/error.ftl | 83 ++++ .../src/main/resources/web/admin/dataview.html | 430 ++++++++++--------- .../web/public/img/logo/marmotta-sad.png | Bin 0 -> 37916 bytes .../resources/web/public/style/blue/error.css | 31 ++ .../resources/web/public/style/white/error.css | 31 ++ 17 files changed, 867 insertions(+), 578 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/cebdd640/launchers/marmotta-webapp/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/cebdd640/platform/marmotta-core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/cebdd640/platform/marmotta-core/src/main/resources/config-defaults.properties ----------------------------------------------------------------------
