From 7f8ecf7dc37403287ce736ba48bbdc64aca71ff7 Mon Sep 17 00:00:00 2001
From: Woonduk Kang <wd.kang@navercorp.com>
Date: Fri, 28 Mar 2014 02:07:50 +0000
Subject: [PATCH] =?UTF-8?q?[=EA=B0=95=EC=9A=B4=EB=8D=95]=20[WEB-95]=20?=
 =?UTF-8?q?=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95.=20MappingJackson2Jsonp?=
 =?UTF-8?q?View=EC=9D=98=20CONTENT=5FTYPE=20=EC=9D=84=20application/jsonp?=
 =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95.=20spring=EC=9D=98=20xml=20?=
 =?UTF-8?q?=EC=A0=95=EB=A6=AC.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-web/trunk@3565 84d0f5b1-2673-498c-a247-62c4ff18d310
---
 .../web/controller/ScatterChartController.java     |  6 +++---
 .../web/util/MappingJackson2JsonpView.java         |  2 +-
 src/main/resources/servlet-context.xml             | 14 ++++++--------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/nhn/pinpoint/web/controller/ScatterChartController.java b/src/main/java/com/nhn/pinpoint/web/controller/ScatterChartController.java
index d44349d51..54ff20403 100644
--- a/src/main/java/com/nhn/pinpoint/web/controller/ScatterChartController.java
+++ b/src/main/java/com/nhn/pinpoint/web/controller/ScatterChartController.java
@@ -134,7 +134,7 @@ public class ScatterChartController {
         } else {
             resultRange = new Range(limitedScanResult.getLimitedTime(), range.getTo());
         }
-        return createModelAndVeiw(resultRange, jsonpCallback, scatterData);
+        return createModelAndView(resultRange, jsonpCallback, scatterData);
     }
 
     private ModelAndView selectScatterData(String applicationName, Range range, int limit, String jsonpCallback) {
@@ -146,10 +146,10 @@ public class ScatterChartController {
         } else {
             resultRange = new Range(scatterData.get(scatterData.size() - 1).getAcceptedTime(), range.getTo());
         }
-        return createModelAndVeiw(resultRange, jsonpCallback, scatterData);
+        return createModelAndView(resultRange, jsonpCallback, scatterData);
     }
 
-    private ModelAndView createModelAndVeiw(Range range, String jsonpCallback, List<Dot> scatterData) {
+    private ModelAndView createModelAndView(Range range, String jsonpCallback, List<Dot> scatterData) {
         ModelAndView mv = new ModelAndView();
         mv.addObject("resultFrom", range.getFrom());
         mv.addObject("resultTo", range.getTo());
diff --git a/src/main/java/com/nhn/pinpoint/web/util/MappingJackson2JsonpView.java b/src/main/java/com/nhn/pinpoint/web/util/MappingJackson2JsonpView.java
index 78a3ce61a..85b127f98 100644
--- a/src/main/java/com/nhn/pinpoint/web/util/MappingJackson2JsonpView.java
+++ b/src/main/java/com/nhn/pinpoint/web/util/MappingJackson2JsonpView.java
@@ -32,7 +32,7 @@ public class MappingJackson2JsonpView extends MappingJackson2JsonView {
     /**
      * Default content type. Overridable as bean property.
      */
-    public static final String DEFAULT_CONTENT_TYPE = "application/json";
+    public static final String DEFAULT_CONTENT_TYPE = "application/jsonp";
 
 
     private ObjectMapper objectMapper = new ObjectMapper();
diff --git a/src/main/resources/servlet-context.xml b/src/main/resources/servlet-context.xml
index 019fce639..dff78edf2 100644
--- a/src/main/resources/servlet-context.xml
+++ b/src/main/resources/servlet-context.xml
@@ -42,18 +42,16 @@
 		<property name="suffix" value=".jsp" />
 	</bean>
 
-    <bean id="unwrapRootJsonObjectMapper" class="com.nhn.pinpoint.web.util.UnwrapRootJackson2ObjectMapper"/>
-
 
 	<bean class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping" />
 	<bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter" />
 	
 	<mvc:interceptors>
-    <bean id="webContentInterceptor" class="org.springframework.web.servlet.mvc.WebContentInterceptor">
-        <property name="cacheSeconds" value="0"/>
-        <property name="useExpiresHeader" value="true"/>
-        <property name="useCacheControlHeader" value="true"/>
-        <property name="useCacheControlNoStore" value="true"/>
-    </bean>
+        <bean id="webContentInterceptor" class="org.springframework.web.servlet.mvc.WebContentInterceptor">
+            <property name="cacheSeconds" value="0"/>
+            <property name="useExpiresHeader" value="true"/>
+            <property name="useCacheControlHeader" value="true"/>
+            <property name="useCacheControlNoStore" value="true"/>
+        </bean>
 	</mvc:interceptors>
 </beans>
\ No newline at end of file