Return-Path: X-Original-To: apmail-marmotta-commits-archive@minotaur.apache.org Delivered-To: apmail-marmotta-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D0C39D663 for ; Fri, 15 Mar 2013 09:25:45 +0000 (UTC) Received: (qmail 62807 invoked by uid 500); 15 Mar 2013 09:25:45 -0000 Delivered-To: apmail-marmotta-commits-archive@marmotta.apache.org Received: (qmail 62755 invoked by uid 500); 15 Mar 2013 09:25:44 -0000 Mailing-List: contact commits-help@marmotta.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@marmotta.incubator.apache.org Delivered-To: mailing list commits@marmotta.incubator.apache.org Received: (qmail 62715 invoked by uid 99); 15 Mar 2013 09:25:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Mar 2013 09:25:43 +0000 X-ASF-Spam-Status: No, hits=-2002.4 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 15 Mar 2013 09:25:40 +0000 Received: (qmail 62166 invoked by uid 99); 15 Mar 2013 09:25:19 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Mar 2013 09:25:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B8D35187C3; Fri, 15 Mar 2013 09:25:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sschaffert@apache.org To: commits@marmotta.incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta Message-Id: <20130315092518.B8D35187C3@tyr.zones.apache.org> Date: Fri, 15 Mar 2013 09:25:18 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Updated Branches: refs/heads/master 289e31e6d -> 358a9fbe4 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/358a9fbe Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/358a9fbe Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/358a9fbe Branch: refs/heads/master Commit: 358a9fbe46a4e947d924396a8ca3ca0851c9773a Parents: 0d292cc 289e31e Author: Sebastian Schaffert Authored: Fri Mar 15 10:23:58 2013 +0100 Committer: Sebastian Schaffert Committed: Fri Mar 15 10:23:58 2013 +0100 ---------------------------------------------------------------------- .../platform/core/rio/RDFHtmlWriterImpl.java | 11 ++- .../services/templating/TemplatingServiceImpl.java | 2 +- .../webservices/resource/ContentWebService.java | 52 ++++++++------- .../core/webservices/resource/MetaWebService.java | 14 ++-- .../webservices/resource/ResourceWebService.java | 2 +- .../resource/ResourceWebServiceHelper.java | 13 +++- .../webservices/triplestore/ContextWebService.java | 2 +- .../src/main/resources/templates/404.ftl | 23 ++++--- .../src/main/resources/templates/rdfhtml.ftl | 43 ++++++------ .../resources/web/public/style/scheme/dark.css | 7 +- 10 files changed, 94 insertions(+), 75 deletions(-) ----------------------------------------------------------------------