content type encoding

git-svn-id: https://svn.argeo.org/commons/trunk@3182 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/FilterSerializer.java b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/FilterSerializer.java
deleted file mode 100644 (file)
index 909158b..0000000
--- a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/FilterSerializer.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.argeo.server.json;
-
-import java.io.IOException;
-
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.JsonProcessingException;
-import org.codehaus.jackson.map.JsonSerializer;
-import org.codehaus.jackson.map.SerializerProvider;
-
-public class FilterSerializer extends JsonSerializer {
-
-       @Override
-       public void serialize(Object value, JsonGenerator jgen,
-                       SerializerProvider provider) throws IOException,
-                       JsonProcessingException {
-               // TODO Auto-generated method stub
-
-       }
-
-}

diff --git a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonObjectFactoryImpl.java b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonObjectFactoryImpl.java
index 40e197e02c624c5c41da21241ee8f12be204605c..a2f0cc4fa0e97f1490457df01a8e4d85dcec8753 100644 (file)
--- a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonObjectFactoryImpl.java
+++ b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonObjectFactoryImpl.java
@@ -5,7 +5,7 @@ import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.server.ArgeoServerException;
+import org.argeo.ArgeoException;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.osgi.framework.BundleContext;
 import org.springframework.beans.factory.InitializingBean;
@@ -38,13 +38,13 @@ public class JsonObjectFactoryImpl implements JsonObjectFactory,
                else {
                        clss = loadClass(type);
                        if (clss == null)
-                               throw new ArgeoServerException("Cannot find type " + type);
+                               throw new ArgeoException("Cannot find type " + type);
                }
 
                try {
                        return (T) objectMapper.readValue(str, clss);
                } catch (Exception e) {
-                       throw new ArgeoServerException("Cannot deserialize " + str
+                       throw new ArgeoException("Cannot deserialize " + str
                                        + " (type=" + type + ")", e);
                }
        }

diff --git a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerSerializer.java b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerSerializer.java
index 96e6d2765d2d2a9727990bc26472432edace50da..bb2bdbe0b533520325a88e8ca4cdefed9e46534f 100644 (file)
--- a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerSerializer.java
+++ b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerSerializer.java
@@ -27,14 +27,16 @@ public class JsonServerSerializer implements ServerSerializer, Serializer {
 
        private Boolean asHtml = false;
 
-       // private String encoding = "UTF8";
+       private String contentTypeCharset = "UTF-8";
 
        public void serialize(Object obj, HttpServletRequest request,
                        HttpServletResponse response) {
                if (asHtml)
-                       response.setContentType("text/html");
+                       response.setContentType("text/html;charset=" + contentTypeCharset);
                else
-                       response.setContentType("application/json");
+                       response.setContentType("application/json;charset="
+                                       + contentTypeCharset);
+
                try {
                        if (asHtml)
                                response.getWriter().append("<pre>");
@@ -54,9 +56,6 @@ public class JsonServerSerializer implements ServerSerializer, Serializer {
 
                JsonGenerator jsonGenerator = null;
                try {
-
-                       // jsonGenerator = jsonFactory.createJsonGenerator(response
-                       // .getOutputStream(), JsonEncoding.valueOf(encoding));
                        jsonGenerator = jsonFactory.createJsonGenerator(writer);
 
                        if (prettyPrint)