From d48fa61581b3daefe1b680d54b5b867f11a0a4fc Mon Sep 17 00:00:00 2001 From: Chisu Yu Date: Thu, 10 Jul 2014 15:47:25 +0900 Subject: [PATCH 1/2] =?UTF-8?q?#152=20static=20resource=20=EC=BA=90?= =?UTF-8?q?=EC=8B=9C=20=EB=AC=B8=EC=A0=9C=EA=B0=80=20=EB=B0=9C=EC=83=9D?= =?UTF-8?q?=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20css,=20js?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EB=92=A4=EC=97=90=20v=3D=EB=B9=8C?= =?UTF-8?q?=EB=93=9C=EC=8B=9C=EA=B0=84=EC=9D=84=20query=20parameter?= =?UTF-8?q?=EB=A1=9C=20=EC=B6=94=EA=B0=80=ED=95=A8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 9 + .../com/nhn/pinpoint/web/taglib/LinkTag.java | 59 ---- .../nhn/pinpoint/web/taglib/ScriptTag.java | 50 --- src/main/webapp/WEB-INF/pinpoint-function.tld | 29 -- src/main/webapp/WEB-INF/web.xml | 2 +- src/main/webapp/index.html | 305 +++++++++++++++++ src/main/webapp/index.jsp | 309 ------------------ src/main/webapp/index_backup.html | 279 ---------------- .../scripts/controllers/transactionList.js | 4 +- 9 files changed, 317 insertions(+), 729 deletions(-) delete mode 100644 src/main/java/com/nhn/pinpoint/web/taglib/LinkTag.java delete mode 100644 src/main/java/com/nhn/pinpoint/web/taglib/ScriptTag.java create mode 100644 src/main/webapp/index.html delete mode 100644 src/main/webapp/index.jsp delete mode 100644 src/main/webapp/index_backup.html diff --git a/pom.xml b/pom.xml index 5035ad375..815ac8f63 100644 --- a/pom.xml +++ b/pom.xml @@ -790,6 +790,15 @@ true classes + + + true + src/main/webapp + + **/*.html + + + diff --git a/src/main/java/com/nhn/pinpoint/web/taglib/LinkTag.java b/src/main/java/com/nhn/pinpoint/web/taglib/LinkTag.java deleted file mode 100644 index ccd136896..000000000 --- a/src/main/java/com/nhn/pinpoint/web/taglib/LinkTag.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.nhn.pinpoint.web.taglib; - -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.SimpleTagSupport; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.nhn.pinpoint.web.util.MavenProjectInformation; - -/** - * - * @author netspider - * - */ -public class LinkTag extends SimpleTagSupport { - - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - private MavenProjectInformation mavenMetaInformation = MavenProjectInformation.getInstance(); - - private String rel = ""; - private String href = ""; - - public void setRel(String rel) { - this.rel = rel; - } - - public void setHref(String href) { - this.href = href; - } - - @Override - public void doTag() throws JspException { - PageContext pageContext = (PageContext) getJspContext(); - JspWriter out = pageContext.getOut(); - try { - StringBuffer sb = new StringBuffer(); - - sb.append(""); - - out.println(sb.toString()); - } catch (Exception e) { - logger.error(e.getMessage(), e); - } - } -} diff --git a/src/main/java/com/nhn/pinpoint/web/taglib/ScriptTag.java b/src/main/java/com/nhn/pinpoint/web/taglib/ScriptTag.java deleted file mode 100644 index a03c6351c..000000000 --- a/src/main/java/com/nhn/pinpoint/web/taglib/ScriptTag.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.nhn.pinpoint.web.taglib; - -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.SimpleTagSupport; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.nhn.pinpoint.web.util.MavenProjectInformation; - -/** - * - * @author netspider - * - */ -public class ScriptTag extends SimpleTagSupport { - - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - private MavenProjectInformation mavenMetaInformation = MavenProjectInformation.getInstance(); - - private String src = ""; - - public void setSrc(String src) { - this.src = src; - } - - @Override - public void doTag() throws JspException { - PageContext pageContext = (PageContext) getJspContext(); - JspWriter out = pageContext.getOut(); - try { - StringBuffer sb = new StringBuffer(); - sb.append(""); - out.println(sb.toString()); - } catch (Exception e) { - logger.error(e.getMessage(), e); - } - } -} diff --git a/src/main/webapp/WEB-INF/pinpoint-function.tld b/src/main/webapp/WEB-INF/pinpoint-function.tld index 5f752a7cc..55362cc00 100644 --- a/src/main/webapp/WEB-INF/pinpoint-function.tld +++ b/src/main/webapp/WEB-INF/pinpoint-function.tld @@ -29,33 +29,4 @@ org.apache.commons.lang3.StringEscapeUtils java.lang.String escapeHtml4(java.lang.String) - - - script - com.nhn.pinpoint.web.taglib.ScriptTag - empty - script tag - - src - true - true - - - - - link - com.nhn.pinpoint.web.taglib.LinkTag - empty - link tag - - rel - true - false - - - href - true - false - - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index fd5980245..116445a71 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -74,6 +74,6 @@ - index.jsp + index.html \ No newline at end of file diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html new file mode 100644 index 000000000..81c0f85af --- /dev/null +++ b/src/main/webapp/index.html @@ -0,0 +1,305 @@ + + + + + + + + + + PINPOINT + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp deleted file mode 100644 index c56c7d681..000000000 --- a/src/main/webapp/index.jsp +++ /dev/null @@ -1,309 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" language="java" pageEncoding="UTF-8" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib prefix="pinpoint" uri="http://pinpoint.nhncorp.com/pinpoint" %> - - - - - - - - - - PINPOINT - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/webapp/index_backup.html b/src/main/webapp/index_backup.html deleted file mode 100644 index 69144f20f..000000000 --- a/src/main/webapp/index_backup.html +++ /dev/null @@ -1,279 +0,0 @@ - - - - - - - - - - PINPOINT - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/webapp/scripts/controllers/transactionList.js b/src/main/webapp/scripts/controllers/transactionList.js index 6df86bddf..c04e3c51c 100644 --- a/src/main/webapp/scripts/controllers/transactionList.js +++ b/src/main/webapp/scripts/controllers/transactionList.js @@ -29,7 +29,7 @@ pinpointApp.controller('TransactionListCtrl', ['TransactionListConfig', '$scope' // initialize private variables; nFetchCount = 1; nLastFetchedIndex = 0; - $scope.transactionDetailUrl = 'index.jsp#/transactionDetail'; + $scope.transactionDetailUrl = 'index.html#/transactionDetail'; $scope.sidebarLoading = true; if(!validateParentWindow()) { @@ -230,7 +230,7 @@ pinpointApp.controller('TransactionListCtrl', ['TransactionListConfig', '$scope' * @param transaction */ changeTransactionDetail = function (transaction) { - var transactionDetailUrl = 'index.jsp#/transactionDetail'; // the filename should be existing, if not it's doesn't work on ie and firefox + var transactionDetailUrl = 'index.html#/transactionDetail'; // the filename should be existing, if not it's doesn't work on ie and firefox if (transaction.traceId && transaction.collectorAcceptTime) { transactionDetailUrl += '/' + encodeURIComponentFilter(transaction.traceId) + '/' + transaction.collectorAcceptTime; $scope.transactionDetailUrl = transactionDetailUrl; From 1cc8d7a120ff6bccea02954b9224d399687f3a74 Mon Sep 17 00:00:00 2001 From: Chisu Yu Date: Fri, 11 Jul 2014 13:16:59 +0900 Subject: [PATCH 2/2] =?UTF-8?q?#152=20script=20tag=20src=EC=97=90=20query?= =?UTF-8?q?=20string=20"v=3D"=EC=9D=B4=20=EB=B9=A0=EC=A0=B8=EC=84=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=ED=95=A8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/index.html | 222 ++++++++++++++++++------------------- 1 file changed, 111 insertions(+), 111 deletions(-) diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index 81c0f85af..820c86b5e 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -57,58 +57,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + @@ -120,8 +120,8 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +