From 6124d21a742e6d491adc3adf0309666f45fcc976 Mon Sep 17 00:00:00 2001 From: Knut Forkalsrud Date: Sat, 31 Dec 2011 17:13:43 -0800 Subject: [PATCH] fixing up content type for JSON. Going HTML5 --- src/main/java/org/forkalsrud/album/web/AlbumServlet.java | 1 + src/main/webapp/WEB-INF/velocity/dynamic.vm | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/forkalsrud/album/web/AlbumServlet.java b/src/main/java/org/forkalsrud/album/web/AlbumServlet.java index 89ce305..b54ad5b 100644 --- a/src/main/java/org/forkalsrud/album/web/AlbumServlet.java +++ b/src/main/java/org/forkalsrud/album/web/AlbumServlet.java @@ -363,6 +363,7 @@ public class AlbumServlet try { Mapper mapper = new Mapper(); res.setContentType("application/json"); + res.setCharacterEncoding("UTF-8"); PrintWriter out = res.getWriter(); out.println("{"); out.println(" \"name\": " + jsStr(entry.getName()) + ","); diff --git a/src/main/webapp/WEB-INF/velocity/dynamic.vm b/src/main/webapp/WEB-INF/velocity/dynamic.vm index a1373ec..b46fe02 100644 --- a/src/main/webapp/WEB-INF/velocity/dynamic.vm +++ b/src/main/webapp/WEB-INF/velocity/dynamic.vm @@ -1,12 +1,11 @@ - - + + $entry.name - +