From 43b4a74116bf010e1897e84006fa4e0afdec62e8 Mon Sep 17 00:00:00 2001
From: Minwoo Jung <minwoo.jung@navercorp.com>
Date: Fri, 10 Jul 2015 18:05:15 +0900
Subject: [PATCH] [#694] solve encoding problem

---
 .../web/controller/BusinessTransactionController.java        | 4 ++++
 web/src/main/resources/applicationContext-web.xml            | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/web/src/main/java/com/navercorp/pinpoint/web/controller/BusinessTransactionController.java b/web/src/main/java/com/navercorp/pinpoint/web/controller/BusinessTransactionController.java
index 3bea619da..e32bcce66 100644
--- a/web/src/main/java/com/navercorp/pinpoint/web/controller/BusinessTransactionController.java
+++ b/web/src/main/java/com/navercorp/pinpoint/web/controller/BusinessTransactionController.java
@@ -80,6 +80,9 @@ public class BusinessTransactionController {
     @Value("#{pinpointWebProps['log.page.url'] ?: ''}")
     private String logPageUrl;
     
+    @Value("#{pinpointWebProps['log.button.disable.message'] ?: ''}")
+    private String disableButtonMessage;
+    
 
     /**
      * executed URLs in applicationname query within from ~ to timeframe
@@ -194,6 +197,7 @@ public class BusinessTransactionController {
             mv.addObject("loggingTransactionInfo", recordSet.isLoggingTransactionInfo());
             mv.addObject("logButtonName", logButtonName);
             mv.addObject("logPageUrl", logPageUrl);
+            mv.addObject("disableButtonMessage", disableButtonMessage);
         }
 
         if (viewVersion == 2) {
diff --git a/web/src/main/resources/applicationContext-web.xml b/web/src/main/resources/applicationContext-web.xml
index f7343db96..c101f74da 100644
--- a/web/src/main/resources/applicationContext-web.xml
+++ b/web/src/main/resources/applicationContext-web.xml
@@ -40,7 +40,10 @@
         </property>
     </bean>
     
-    <util:properties id="pinpointWebProps" location="classpath:pinpoint-web.properties"/>
+    <bean id="pinpointWebProps" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
+        <property name="location" value="classpath:pinpoint-web.properties"/>
+        <property name="fileEncoding" value="UTF-8"/>
+    </bean>
     
     <!-- 
     <util:properties id="dataProps" location="classpath:data.properties"/>