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 53CB810BBB for ; Thu, 13 Mar 2014 14:38:20 +0000 (UTC) Received: (qmail 21271 invoked by uid 500); 13 Mar 2014 14:38:19 -0000 Delivered-To: apmail-marmotta-commits-archive@marmotta.apache.org Received: (qmail 21201 invoked by uid 500); 13 Mar 2014 14:38:16 -0000 Mailing-List: contact commits-help@marmotta.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@marmotta.apache.org Delivered-To: mailing list commits@marmotta.apache.org Received: (qmail 19973 invoked by uid 99); 13 Mar 2014 14:38:08 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Mar 2014 14:38:08 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1693D944452; Thu, 13 Mar 2014 14:38:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jakob@apache.org To: commits@marmotta.apache.org Date: Thu, 13 Mar 2014 14:38:09 -0000 Message-Id: <6fe6e63bd40f408ab3064138cc4fe2db@git.apache.org> In-Reply-To: <7bfdf7573c3e4571a23a5cea957ad3d3@git.apache.org> References: <7bfdf7573c3e4571a23a5cea957ad3d3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: MARMOTTA-189: set default encoding in templating to enable url-encoding see http://freemarker.org/docs/ref_builtins_string.html#ref_builtin_url MARMOTTA-189: set default encoding in templating to enable url-encoding see http://freemarker.org/docs/ref_builtins_string.html#ref_builtin_url Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/42561a73 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/42561a73 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/42561a73 Branch: refs/heads/MARMOTTA-189 Commit: 42561a732de347932086650496b851fcbc6799e2 Parents: 2b71c07 Author: Jakob Frank Authored: Thu Mar 13 15:28:51 2014 +0100 Committer: Jakob Frank Committed: Thu Mar 13 15:35:17 2014 +0100 ---------------------------------------------------------------------- .../platform/core/services/templating/TemplatingServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/42561a73/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java index 02a5ff7..231326f 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java @@ -124,6 +124,8 @@ public class TemplatingServiceImpl implements TemplatingService { @Override public Configuration getConfiguration(Class cls) { Configuration cfg = new Configuration(); + cfg.setDefaultEncoding("utf-8"); + cfg.setURLEscapingCharset("utf-8"); try { cfg.setDirectoryForTemplateLoading(templateDir); } catch (IOException e) {