You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by oz...@apache.org on 2015/05/08 10:13:58 UTC
hadoop git commit: YARN-3589. RM and AH web UI display DOCTYPE
wrongly. Contbituted by Rohith.
Repository: hadoop
Updated Branches:
refs/heads/trunk fd605997e -> f26700f28
YARN-3589. RM and AH web UI display DOCTYPE wrongly. Contbituted by Rohith.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f26700f2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f26700f2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f26700f2
Branch: refs/heads/trunk
Commit: f26700f2878f4374c68e97ee00205eda5a6d022c
Parents: fd60599
Author: Tsuyoshi Ozawa <oz...@apache.org>
Authored: Fri May 8 17:13:40 2015 +0900
Committer: Tsuyoshi Ozawa <oz...@apache.org>
Committed: Fri May 8 17:13:40 2015 +0900
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 2 ++
.../hadoop/yarn/webapp/view/HtmlPage.java | 2 +-
.../hadoop/yarn/webapp/view/TextView.java | 22 +++++++++++++++++++-
3 files changed, 24 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f26700f2/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 489cee3..3c2c842 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -344,6 +344,8 @@ Release 2.8.0 - UNRELEASED
YARN-3592. Fix typos in RMNodeLabelsManager. (Sunil G via devaraj)
+ YARN-3589. RM and AH web UI display DOCTYPE wrongly. (Rohith via ozawa)
+
Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f26700f2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/HtmlPage.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/HtmlPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/HtmlPage.java
index 9c200f6..1d176d4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/HtmlPage.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/HtmlPage.java
@@ -78,7 +78,7 @@ public abstract class HtmlPage extends TextView {
@Override
public void render() {
- puts(DOCTYPE);
+ putWithoutEscapeHtml(DOCTYPE);
render(page().html().meta_http("X-UA-Compatible", "IE=8")
.meta_http("Content-type", MimeType.HTML));
if (page().nestLevel() != 0) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f26700f2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TextView.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TextView.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TextView.java
index 4983dac..7a36c5a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TextView.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TextView.java
@@ -40,7 +40,7 @@ public abstract class TextView extends View {
}
/**
- * Print strings as is (no newline, a la php echo).
+ * Print strings escaping html.
* @param args the strings to print
*/
public void echo(Object... args) {
@@ -53,6 +53,17 @@ public abstract class TextView extends View {
}
/**
+ * Print strings as is (no newline, a la php echo).
+ * @param args the strings to print
+ */
+ public void echoWithoutEscapeHtml(Object... args) {
+ PrintWriter out = writer();
+ for (Object s : args) {
+ out.print(s);
+ }
+ }
+
+ /**
* Print strings as a line (new line appended at the end, a la C/Tcl puts).
* @param args the strings to print
*/
@@ -60,4 +71,13 @@ public abstract class TextView extends View {
echo(args);
writer().println();
}
+
+ /**
+ * Print string as a line. This does not escapes the string for html
+ * @param args the strings to print
+ */
+ public void putWithoutEscapeHtml(Object args) {
+ echoWithoutEscapeHtml(args);
+ writer().println();
+ }
}