Merge pull request #705 from minwoo-jung/naver-157

Naver 157

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"/>

web/src/main/webapp/WEB-INF/views/transactionInfoJson.jsp

@@ -13,7 +13,17 @@
     "logLinkEnable" : ${logLinkEnable},
     "loggingTransactionInfo" : ${loggingTransactionInfo},
     "logButtonName": "${logButtonName}",
-    "logPageUrl" : "${logPageUrl}",
+    "logPageUrl" : 
+	    <c:choose>
+		<c:when test="${not empty logPageUrl}">
+			<c:url value="${logPageUrl}" var="comBindedlogPageUrl">
+				<c:param name="transactionId" value="${traceId.formatString}" />
+				<c:param name="time" value="${callstackStart}" />
+			</c:url>
+			"${comBindedlogPageUrl}"
+		</c:when>
+		<c:otherwise>""</c:otherwise>
+		</c:choose>,
     "disableButtonMessage" : "${disableButtonMessage}",
 	"callStackIndex" : {
 		"depth":0,