http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/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 1d176d4..210cf04 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 @@ -25,17 +25,17 @@ import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.yarn.webapp.MimeType; import org.apache.hadoop.yarn.webapp.SubView; import org.apache.hadoop.yarn.webapp.WebAppException; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet; /** * The parent class of all HTML pages. Override - * {@link #render(org.apache.hadoop.yarn.webapp.hamlet.Hamlet.HTML)} + * {@link #render(org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.HTML)} * to actually render the page. */ @InterfaceAudience.LimitedPrivate({"YARN", "MapReduce"}) public abstract class HtmlPage extends TextView { - public static class _ implements Hamlet._ { + public static class __ implements Hamlet.__ { } public class Page extends Hamlet { @@ -50,8 +50,8 @@ public abstract class HtmlPage extends TextView { setWasInline(context().wasInline()); } - public HTML<HtmlPage._> html() { - return new HTML<HtmlPage._>("html", null, EnumSet.of(EOpt.ENDTAG)); + public HTML<HtmlPage.__> html() { + return new HTML<HtmlPage.__>("html", null, EnumSet.of(EOpt.ENDTAG)); } } @@ -91,6 +91,6 @@ public abstract class HtmlPage extends TextView { * Render the the HTML page. * @param html the page to render data to. */ - protected abstract void render(Page.HTML<_> html); + protected abstract void render(Page.HTML<__> html); }
http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/InfoBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/InfoBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/InfoBlock.java index 9fe67f1..0ad8b3c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/InfoBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/InfoBlock.java @@ -26,11 +26,11 @@ import static org.apache.hadoop.yarn.webapp.view.JQueryUI._ODD; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.yarn.webapp.ResponseInfo; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.DIV; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TABLE; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TD; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TR; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.DIV; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TABLE; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TD; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TR; import com.google.inject.Inject; @@ -47,7 +47,7 @@ public class InfoBlock extends HtmlBlock { div(_INFO_WRAP). table(_INFO). tr(). - th().$class(C_TH).$colspan(2)._(info.about())._()._(); + th().$class(C_TH).$colspan(2).__(info.about()).__().__(); int i = 0; for (ResponseInfo.Item item : info) { TR<TABLE<DIV<Hamlet>>> tr = table. @@ -62,23 +62,23 @@ public class InfoBlock extends HtmlBlock { DIV<TD<TR<TABLE<DIV<Hamlet>>>>> singleLineDiv; for ( String line :lines) { singleLineDiv = td.div(); - singleLineDiv._(line); - singleLineDiv._(); + singleLineDiv.__(line); + singleLineDiv.__(); } } else { - td._(value); + td.__(value); } - td._(); + td.__(); } else { - tr.td()._r(value)._(); + tr.td()._r(value).__(); } } else { tr. td(). - a(url(item.url), value)._(); + a(url(item.url), value).__(); } - tr._(); + tr.__(); } - table._()._(); + table.__().__(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java index 06372e3..46c76d9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java @@ -26,7 +26,7 @@ import static org.apache.hadoop.yarn.util.StringHelper.split; import java.util.List; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.yarn.webapp.hamlet.HamletSpec.HTML; +import org.apache.hadoop.yarn.webapp.hamlet2.HamletSpec.HTML; import com.google.common.collect.Lists; @@ -82,19 +82,19 @@ public class JQueryUI extends HtmlBlock { initProgressBars(list); if (!list.isEmpty()) { - html.script().$type("text/javascript")._("$(function() {") - ._(list.toArray())._("});")._(); + html.script().$type("text/javascript").__("$(function() {") + .__(list.toArray()).__("});").__(); } } public static void jsnotice(HTML html) { html. div("#jsnotice.ui-state-error"). - _("This page will not function without javascript enabled." - + " Please enable javascript on your browser.")._(); + __("This page will not function without javascript enabled." + + " Please enable javascript on your browser.").__(); html. script().$type("text/javascript"). - _("$('#jsnotice').hide();")._(); + __("$('#jsnotice').hide();").__(); } protected void initAccordions(List<String> list) { @@ -130,7 +130,7 @@ public class JQueryUI extends HtmlBlock { // for inserting stateSaveInit int pos = init.indexOf('{') + 1; init = new StringBuffer(init).insert(pos, stateSaveInit).toString(); - list.add(join(id,"DataTable = $('#", id, "').dataTable(", init, + list.add(join(id, "DataTable = $('#", id, "').dataTable(", init, ").fnSetFilteringDelay(188);")); String postInit = $(postInitID(DATATABLES, id)); if(!postInit.isEmpty()) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/LipsumBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/LipsumBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/LipsumBlock.java index 4781a20..a4b6f63 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/LipsumBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/LipsumBlock.java @@ -27,7 +27,7 @@ public class LipsumBlock extends HtmlBlock { public void render(Block html) { html. p(). - _("Lorem ipsum dolor sit amet, consectetur adipiscing elit.", + __("Lorem ipsum dolor sit amet, consectetur adipiscing elit.", "Vivamus eu dui in ipsum tincidunt egestas ac sed nibh.", "Praesent quis nisl lorem, nec interdum urna.", "Duis sagittis dignissim purus sed sollicitudin.", @@ -45,6 +45,6 @@ public class LipsumBlock extends HtmlBlock { "Proin eu ante nisl, vel porttitor eros.", "Aliquam gravida luctus augue, at scelerisque enim consectetur vel.", "Donec interdum tempor nisl, quis laoreet enim venenatis eu.", - "Quisque elit elit, vulputate eget porta vel, laoreet ac lacus.")._(); + "Quisque elit elit, vulputate eget porta vel, laoreet ac lacus.").__(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/NavBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/NavBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/NavBlock.java index cdc13eb..a684eee 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/NavBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/NavBlock.java @@ -30,12 +30,12 @@ public class NavBlock extends HtmlBlock { ul(). li("Item 1"). li("Item 2"). - li("...")._(). + li("...").__(). h3("Tools"). ul(). - li().a("/conf", "Configuration")._(). - li().a("/stacks", "Thread dump")._(). - li().a("/logs", "Logs")._(). - li().a("/jmx?qry=Hadoop:*", "Metrics")._()._()._(); + li().a("/conf", "Configuration").__(). + li().a("/stacks", "Thread dump").__(). + li().a("/logs", "Logs").__(). + li().a("/jmx?qry=Hadoop:*", "Metrics").__().__().__(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TwoColumnCssLayout.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TwoColumnCssLayout.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TwoColumnCssLayout.java index 23aa51b..3e83199 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TwoColumnCssLayout.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TwoColumnCssLayout.java @@ -31,11 +31,11 @@ import org.apache.hadoop.yarn.webapp.SubView; @InterfaceAudience.LimitedPrivate({"YARN", "MapReduce"}) public class TwoColumnCssLayout extends HtmlPage { - @Override protected void render(Page.HTML<_> html) { + @Override protected void render(Page.HTML<__> html) { preHead(html); html. title($("title")). - link(root_url("static","yarn.css")). + link(root_url("static", "yarn.css")). style(".main { min-height: 100%; height: auto !important; height: 100%;", " margin: 0 auto -4em; border: 0; }", ".footer, .push { height: 4em; clear: both; border: 0 }", @@ -50,28 +50,28 @@ public class TwoColumnCssLayout extends HtmlPage { " right: 100%; overflow: hidden; }", ".leftnav .nav { float: left; width: 11em; position: relative;", " right: 12em; overflow: hidden; }"). - _(JQueryUI.class); + __(JQueryUI.class); postHead(html); JQueryUI.jsnotice(html); html. div(".main.ui-widget-content"). - _(header()). + __(header()). div(".cmask.leftnav"). div(".c1right"). div(".c1wrap"). div(".content"). - _(content())._()._(). + __(content()).__().__(). div(".nav"). - _(nav()). - div(".push")._()._()._()._()._(). + __(nav()). + div(".push").__().__().__().__().__(). div(".footer.ui-widget-content"). - _(footer())._()._(); + __(footer()).__().__(); } - protected void preHead(Page.HTML<_> html) { + protected void preHead(Page.HTML<__> html) { } - protected void postHead(Page.HTML<_> html) { + protected void postHead(Page.HTML<__> html) { } protected Class<? extends SubView> header() { http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TwoColumnLayout.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TwoColumnLayout.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TwoColumnLayout.java index 4d7752d..fe71395 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TwoColumnLayout.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TwoColumnLayout.java @@ -39,18 +39,18 @@ public class TwoColumnLayout extends HtmlPage { * (non-Javadoc) * @see org.apache.hadoop.yarn.webapp.view.HtmlPage#render(org.apache.hadoop.yarn.webapp.hamlet.Hamlet.HTML) */ - @Override protected void render(Page.HTML<_> html) { + @Override protected void render(Page.HTML<__> html) { preHead(html); html. title($(TITLE)). - link(root_url("static","yarn.css")). + link(root_url("static", "yarn.css")). style("#layout { height: 100%; }", "#layout thead td { height: 3em; }", "#layout #navcell { width: 11em; padding: 0 1em; }", "#layout td.content { padding-top: 0 }", "#layout tbody { vertical-align: top; }", "#layout tfoot td { height: 4em; }"). - _(JQueryUI.class); + __(JQueryUI.class); postHead(html); JQueryUI.jsnotice(html); html. @@ -58,17 +58,17 @@ public class TwoColumnLayout extends HtmlPage { thead(). tr(). td().$colspan(2). - _(header())._()._()._(). + __(header()).__().__().__(). tfoot(). tr(). td().$colspan(2). - _(footer())._()._()._(). + __(footer()).__().__().__(). tbody(). tr(). td().$id("navcell"). - _(nav())._(). + __(nav()).__(). td().$class("content"). - _(content())._()._()._()._()._(); + __(content()).__().__().__().__().__(); } /** @@ -76,14 +76,14 @@ public class TwoColumnLayout extends HtmlPage { * involves setting page variables for Javascript and CSS rendering. * @param html the html to use to render. */ - protected void preHead(Page.HTML<_> html) { + protected void preHead(Page.HTML<__> html) { } /** * Do what needs to be done after the header is rendered. * @param html the html to use to render. */ - protected void postHead(Page.HTML<_> html) { + protected void postHead(Page.HTML<__> html) { } /** @@ -120,7 +120,7 @@ public class TwoColumnLayout extends HtmlPage { * @param tableId the ID of the table to set styles on. * @param innerStyles any other styles to add to the table. */ - protected void setTableStyles(Page.HTML<_> html, String tableId, + protected void setTableStyles(Page.HTML<__> html, String tableId, String... innerStyles) { List<String> styles = Lists.newArrayList(); styles.add(join('#', tableId, "_paginate span {font-weight:normal}")); http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/TestSubViews.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/TestSubViews.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/TestSubViews.java index 66d9ef2..075bed2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/TestSubViews.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/TestSubViews.java @@ -32,14 +32,14 @@ public class TestSubViews { static public class MainView extends HtmlPage { @Override - public void render(Page.HTML<_> html) { + public void render(Page.HTML<__> html) { html. body(). div(). - _(Sub1.class)._(). + __(Sub1.class).__(). div(). i("inline text"). - _(Sub2.class)._()._()._(); + __(Sub2.class).__().__().__(); } } @@ -48,7 +48,7 @@ public class TestSubViews { public void render(Block html) { html. div("#sub1"). - _("sub1 text")._(); + __("sub1 text").__(); } } @@ -57,7 +57,7 @@ public class TestSubViews { public void render(Block html) { html. pre(). - _("sub2 text")._(); + __("sub2 text").__(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/TestWebApp.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/TestWebApp.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/TestWebApp.java index db50dd3..dea146d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/TestWebApp.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/TestWebApp.java @@ -100,7 +100,7 @@ public class TestWebApp { static class TablesView extends HtmlPage { @Override - public void render(Page.HTML<_> html) { + public void render(Page.HTML<__> html) { set(DATATABLES_ID, "t1 t2 t3 t4"); set(initID(DATATABLES, "t1"), tableInit().append("}").toString()); set(initID(DATATABLES, "t2"), join("{bJQueryUI:true, sDom:'t',", @@ -110,7 +110,7 @@ public class TestWebApp { html. title("Test DataTables"). link("/static/yarn.css"). - _(JQueryUI.class). + __(JQueryUI.class). style(".wrapper { padding: 1em }", ".wrapper h2 { margin: 0.5em 0 }", ".dataTables_wrapper { min-height: 1em }"). @@ -118,33 +118,33 @@ public class TestWebApp { h2("Default table init"). table("#t1"). thead(). - tr().th("Column1").th("Column2")._()._(). + tr().th("Column1").th("Column2").__().__(). tbody(). - tr().td("c1r1").td("c2r1")._(). - tr().td("c1r2").td("c2r2")._()._()._(). + tr().td("c1r1").td("c2r1").__(). + tr().td("c1r2").td("c2r2").__().__().__(). h2("Nested tables"). div(_INFO_WRAP). table("#t2"). thead(). - tr().th(_TH, "Column1").th(_TH, "Column2")._()._(). + tr().th(_TH, "Column1").th(_TH, "Column2").__().__(). tbody(). tr().td("r1"). // th wouldn't work as of dt 1.7.5 td().$class(C_TABLE). table("#t3"). thead(). - tr().th("SubColumn1").th("SubColumn2")._()._(). + tr().th("SubColumn1").th("SubColumn2").__().__(). tbody(). - tr().td("subc1r1").td("subc2r1")._(). - tr().td("subc1r2").td("subc2r2")._()._()._()._()._(). + tr().td("subc1r1").td("subc2r1").__(). + tr().td("subc1r2").td("subc2r2").__().__().__().__().__(). tr().td("r2"). // ditto td().$class(C_TABLE). table("#t4"). thead(). - tr().th("SubColumn1").th("SubColumn2")._()._(). + tr().th("SubColumn1").th("SubColumn2").__().__(). tbody(). - tr().td("subc1r1").td("subc2r1")._(). - tr().td("subc1r2").td("subc2r2")._(). - _()._()._()._()._()._()._()._()._(); + tr().td("subc1r1").td("subc2r1").__(). + tr().td("subc1r2").td("subc2r2").__(). + __().__().__().__().__().__().__().__().__(); } } @@ -358,7 +358,7 @@ public class TestWebApp { assertEquals("foo", getContent(baseUrl +"test/foo").trim()); app1 = WebApps.$for("test", this).at(port).start(); assertEquals(port, app1.getListenerAddress().getPort()); - app2 = WebApps.$for("test", this).at("0.0.0.0",port, true).start(); + app2 = WebApps.$for("test", this).at("0.0.0.0", port, true).start(); assertTrue(app2.getListenerAddress().getPort() > port); Configuration conf = new Configuration(); port = ServerSocketUtil.waitForPort(47000, 60); http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestHtmlBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestHtmlBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestHtmlBlock.java index 89042c6..e510dd5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestHtmlBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestHtmlBlock.java @@ -24,8 +24,6 @@ import java.io.PrintWriter; import org.apache.hadoop.yarn.webapp.WebAppException; import org.apache.hadoop.yarn.webapp.test.WebAppTests; -import org.apache.hadoop.yarn.webapp.view.HtmlBlock; -import org.apache.hadoop.yarn.webapp.view.HtmlPage; import org.junit.Test; import static org.mockito.Mockito.*; @@ -35,7 +33,7 @@ public class TestHtmlBlock { @Override public void render(Block html) { html. - p("#testid")._("test note")._(); + p("#testid").__("test note").__(); } } @@ -43,16 +41,16 @@ public class TestHtmlBlock { @Override public void render(Block html) { html. - p()._("should throw"); + p().__("should throw"); } } public static class ShortPage extends HtmlPage { @Override - public void render(Page.HTML<_> html) { + public void render(Page.HTML<__> html) { html. title("short test"). - _(ShortBlock.class); + __(ShortBlock.class); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestHtmlPage.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestHtmlPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestHtmlPage.java index a5a8e1f..beed31f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestHtmlPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestHtmlPage.java @@ -25,7 +25,6 @@ import java.io.PrintWriter; import org.apache.hadoop.yarn.webapp.MimeType; import org.apache.hadoop.yarn.webapp.WebAppException; import org.apache.hadoop.yarn.webapp.test.WebAppTests; -import org.apache.hadoop.yarn.webapp.view.HtmlPage; import org.junit.Test; import static org.mockito.Mockito.*; @@ -34,19 +33,19 @@ public class TestHtmlPage { public static class TestView extends HtmlPage { @Override - public void render(Page.HTML<_> html) { + public void render(Page.HTML<__> html) { html. title("test"). - p("#testid")._("test note")._()._(); + p("#testid").__("test note").__().__(); } } public static class ShortView extends HtmlPage { @Override - public void render(Page.HTML<_> html) { + public void render(Page.HTML<__> html) { html. title("short test"). - p()._("should throw"); + p().__("should throw"); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestInfoBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestInfoBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestInfoBlock.java index da5efbb..751aa2c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestInfoBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestInfoBlock.java @@ -45,7 +45,7 @@ public class TestInfoBlock { static { resInfo = new ResponseInfo(); - resInfo._("User_Name", JAVASCRIPT); + resInfo.__("User_Name", JAVASCRIPT); } @Override @@ -68,8 +68,8 @@ public class TestInfoBlock { static { resInfo = new ResponseInfo(); - resInfo._("Multiple_line_value", "This is one line."); - resInfo._("Multiple_line_value", "This is first line.\nThis is second line."); + resInfo.__("Multiple_line_value", "This is one line."); + resInfo.__("Multiple_line_value", "This is first line.\nThis is second line."); } @Override http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestTwoColumnCssPage.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestTwoColumnCssPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestTwoColumnCssPage.java index a718636..20df409 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestTwoColumnCssPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestTwoColumnCssPage.java @@ -22,8 +22,6 @@ import org.apache.hadoop.yarn.MockApps; import org.apache.hadoop.yarn.webapp.Controller; import org.apache.hadoop.yarn.webapp.WebApps; import org.apache.hadoop.yarn.webapp.test.WebAppTests; -import org.apache.hadoop.yarn.webapp.view.HtmlPage; -import org.apache.hadoop.yarn.webapp.view.TwoColumnCssLayout; import org.junit.Test; public class TestTwoColumnCssPage { @@ -52,10 +50,10 @@ public class TestTwoColumnCssPage { public static class TestView extends HtmlPage { @Override - public void render(Page.HTML<_> html) { + public void render(Page.HTML<__> html) { html. title($("title")). - h1($("title"))._(); + h1($("title")).__(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSErrorsAndWarningsPage.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSErrorsAndWarningsPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSErrorsAndWarningsPage.java index 3798ee5..1601f8c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSErrorsAndWarningsPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSErrorsAndWarningsPage.java @@ -34,7 +34,7 @@ public class AHSErrorsAndWarningsPage extends AHSView { } @Override - protected void preHead(Page.HTML<_> html) { + protected void preHead(Page.HTML<__> html) { commonPreHead(html); String title = "Errors and Warnings in the Application History Server"; setTitle(title); http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSLogsPage.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSLogsPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSLogsPage.java index 8821bc0..d845503 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSLogsPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSLogsPage.java @@ -32,7 +32,7 @@ public class AHSLogsPage extends AHSView { * preHead(org.apache.hadoop .yarn.webapp.hamlet.Hamlet.HTML) */ @Override - protected void preHead(Page.HTML<_> html) { + protected void preHead(Page.HTML<__> html) { String logEntity = $(ENTITY_STRING); if (logEntity == null || logEntity.isEmpty()) { logEntity = $(CONTAINER_ID); http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSView.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSView.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSView.java index 65b5ac1..d965eeb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSView.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSView.java @@ -37,7 +37,7 @@ public class AHSView extends TwoColumnLayout { static final int MAX_FAST_ROWS = 1000; // inline js array @Override - protected void preHead(Page.HTML<_> html) { + protected void preHead(Page.HTML<__> html) { commonPreHead(html); set(DATATABLES_ID, "apps"); set(initID(DATATABLES, "apps"), WebPageUtils.appsTableInit(false)); @@ -49,7 +49,7 @@ public class AHSView extends TwoColumnLayout { setTitle(sjoin(reqState, "Applications")); } - protected void commonPreHead(Page.HTML<_> html) { + protected void commonPreHead(Page.HTML<__> html) { set(ACCORDION_ID, "nav"); set(initID(ACCORDION, "nav"), "{autoHeight:false, active:0}"); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AboutBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AboutBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AboutBlock.java index b2419e9..996568b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AboutBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AboutBlock.java @@ -19,9 +19,7 @@ package org.apache.hadoop.yarn.server.applicationhistoryservice.webapp; import com.google.inject.Inject; -import org.apache.hadoop.util.VersionInfo; import org.apache.hadoop.yarn.api.records.timeline.TimelineAbout; -import org.apache.hadoop.yarn.util.YarnVersionInfo; import org.apache.hadoop.yarn.util.timeline.TimelineUtils; import org.apache.hadoop.yarn.webapp.View; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; @@ -38,10 +36,10 @@ public class AboutBlock extends HtmlBlock { TimelineAbout tsInfo = TimelineUtils.createTimelineAbout( "Timeline Server - Generic History Service UI"); info("Timeline Server Overview"). - _("Timeline Server Version:", tsInfo.getTimelineServiceBuildVersion() + + __("Timeline Server Version:", tsInfo.getTimelineServiceBuildVersion() + " on " + tsInfo.getTimelineServiceVersionBuiltOn()). - _("Hadoop Version:", tsInfo.getHadoopBuildVersion() + + __("Hadoop Version:", tsInfo.getHadoopBuildVersion() + " on " + tsInfo.getHadoopVersionBuiltOn()); - html._(InfoBlock.class); + html.__(InfoBlock.class); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AboutPage.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AboutPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AboutPage.java index b50073a..1df5832 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AboutPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AboutPage.java @@ -20,12 +20,9 @@ package org.apache.hadoop.yarn.server.applicationhistoryservice.webapp; import org.apache.hadoop.yarn.webapp.SubView; -import org.apache.hadoop.yarn.webapp.YarnWebParams; - -import static org.apache.hadoop.yarn.util.StringHelper.join; public class AboutPage extends AHSView { - @Override protected void preHead(Page.HTML<_> html) { + @Override protected void preHead(Page.HTML<__> html) { commonPreHead(html); set(TITLE, "Timeline Server - Generic History Service"); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppAttemptPage.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppAttemptPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppAttemptPage.java index a08297d..ec00db6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppAttemptPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppAttemptPage.java @@ -29,7 +29,7 @@ import org.apache.hadoop.yarn.webapp.YarnWebParams; public class AppAttemptPage extends AHSView { @Override - protected void preHead(Page.HTML<_> html) { + protected void preHead(Page.HTML<__> html) { commonPreHead(html); String appAttemptId = $(YarnWebParams.APPLICATION_ATTEMPT_ID); http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppPage.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppPage.java index c0e1394..32fcc95 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppPage.java @@ -30,7 +30,7 @@ import org.apache.hadoop.yarn.webapp.YarnWebParams; public class AppPage extends AHSView { @Override - protected void preHead(Page.HTML<_> html) { + protected void preHead(Page.HTML<__> html) { commonPreHead(html); String appId = $(YarnWebParams.APPLICATION_ID); http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/ContainerPage.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/ContainerPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/ContainerPage.java index 1be8a26..8327ee6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/ContainerPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/ContainerPage.java @@ -26,7 +26,7 @@ import org.apache.hadoop.yarn.webapp.YarnWebParams; public class ContainerPage extends AHSView { @Override - protected void preHead(Page.HTML<_> html) { + protected void preHead(Page.HTML<__> html) { commonPreHead(html); String containerId = $(YarnWebParams.CONTAINER_ID); http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/NavBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/NavBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/NavBlock.java index 25ee4f0..3ee4dd1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/NavBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/NavBlock.java @@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.impl.Log4JLogger; import org.apache.hadoop.yarn.api.records.YarnApplicationState; import org.apache.hadoop.yarn.util.Log4jWarningErrorMetricsAppender; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; public class NavBlock extends HtmlBlock { @@ -44,34 +44,34 @@ public class NavBlock extends HtmlBlock { h3("Application History"). ul(). li().a(url("about"), "About"). - _(). + __(). li().a(url("apps"), "Applications"). ul(). li().a(url("apps", YarnApplicationState.FINISHED.toString()), YarnApplicationState.FINISHED.toString()). - _(). + __(). li().a(url("apps", YarnApplicationState.FAILED.toString()), YarnApplicationState.FAILED.toString()). - _(). + __(). li().a(url("apps", YarnApplicationState.KILLED.toString()), YarnApplicationState.KILLED.toString()). - _(). - _(). - _(). - _(); + __(). + __(). + __(). + __(); Hamlet.UL<Hamlet.DIV<Hamlet>> tools = nav.h3("Tools").ul(); - tools.li().a("/conf", "Configuration")._() - .li().a("/logs", "Local logs")._() - .li().a("/stacks", "Server stacks")._() - .li().a("/jmx?qry=Hadoop:*", "Server metrics")._(); + tools.li().a("/conf", "Configuration").__() + .li().a("/logs", "Local logs").__() + .li().a("/stacks", "Server stacks").__() + .li().a("/jmx?qry=Hadoop:*", "Server metrics").__(); if (addErrorsAndWarningsLink) { - tools.li().a(url("errors-and-warnings"), "Errors/Warnings")._(); + tools.li().a(url("errors-and-warnings"), "Errors/Warnings").__(); } - tools._()._(); + tools.__().__(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppAttemptBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppAttemptBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppAttemptBlock.java index 798c372..87c554d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppAttemptBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppAttemptBlock.java @@ -36,10 +36,9 @@ import org.apache.hadoop.yarn.api.records.ContainerReport; import org.apache.hadoop.yarn.api.records.YarnApplicationAttemptState; import org.apache.hadoop.yarn.server.webapp.dao.AppAttemptInfo; import org.apache.hadoop.yarn.server.webapp.dao.ContainerInfo; -import org.apache.hadoop.yarn.util.ConverterUtils; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TABLE; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TBODY; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TABLE; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TBODY; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; import org.apache.hadoop.yarn.webapp.view.InfoBlock; import com.google.inject.Inject; @@ -94,7 +93,7 @@ public class AppAttemptBlock extends HtmlBlock { String message = "Failed to read the application attempt " + appAttemptId + "."; LOG.error(message, e); - html.p()._(message)._(); + html.p().__(message).__(); return; } @@ -140,14 +139,14 @@ public class AppAttemptBlock extends HtmlBlock { if (exceptionWhenGetContainerReports) { html .p() - ._( + .__( "Sorry, Failed to get containers for application attempt" + attemptid - + ".")._(); + + ".").__(); return; } createAttemptHeadRoomTable(html); - html._(InfoBlock.class); + html.__(InfoBlock.class); createTablesForAttemptMetrics(html); @@ -155,7 +154,7 @@ public class AppAttemptBlock extends HtmlBlock { TBODY<TABLE<Hamlet>> tbody = html.table("#containers").thead().tr().th(".id", "Container ID") .th(".node", "Node").th(".exitstatus", "Container Exit Status") - .th(".logs", "Logs")._()._().tbody(); + .th(".logs", "Logs").__().__().tbody(); StringBuilder containersTableData = new StringBuilder("[\n"); for (ContainerReport containerReport : containers) { @@ -186,9 +185,9 @@ public class AppAttemptBlock extends HtmlBlock { } containersTableData.append("]"); html.script().$type("text/javascript") - ._("var containersTableData=" + containersTableData)._(); + .__("var containersTableData=" + containersTableData).__(); - tbody._()._(); + tbody.__().__(); } protected void generateOverview(ApplicationAttemptReport appAttemptReport, @@ -196,18 +195,18 @@ public class AppAttemptBlock extends HtmlBlock { String node) { String amContainerId = appAttempt.getAmContainerId(); info("Application Attempt Overview") - ._( + .__( "Application Attempt State:", appAttempt.getAppAttemptState() == null ? UNAVAILABLE : appAttempt .getAppAttemptState()) - ._("AM Container:", + .__("AM Container:", amContainerId == null || containers == null || !hasAMContainer(appAttemptReport.getAMContainerId(), containers) ? null : root_url("container", amContainerId), amContainerId == null ? "N/A" : amContainerId) - ._("Node:", node) - ._( + .__("Node:", node) + .__( "Tracking URL:", appAttempt.getTrackingUrl() == null || appAttempt.getTrackingUrl().equals(UNAVAILABLE) ? null @@ -219,7 +218,7 @@ public class AppAttemptBlock extends HtmlBlock { || appAttempt.getAppAttemptState() == YarnApplicationAttemptState.FAILED || appAttempt.getAppAttemptState() == YarnApplicationAttemptState.KILLED ? "History" : "ApplicationMaster") - ._( + .__( "Diagnostics Info:", appAttempt.getDiagnosticsInfo() == null ? "" : appAttempt .getDiagnosticsInfo()); http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java index 11bd9b4..d4090aa 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java @@ -55,9 +55,9 @@ import org.apache.hadoop.yarn.util.Apps; import org.apache.hadoop.yarn.util.Times; import org.apache.hadoop.yarn.webapp.ResponseInfo; import org.apache.hadoop.yarn.webapp.YarnWebParams; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TABLE; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TBODY; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TABLE; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TBODY; import org.apache.hadoop.yarn.webapp.util.WebAppUtils; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; import org.apache.hadoop.yarn.webapp.view.InfoBlock; @@ -116,7 +116,7 @@ public class AppBlock extends HtmlBlock { } catch (Exception e) { String message = "Failed to read the application " + appID + "."; LOG.error(message, e); - html.p()._(message)._(); + html.p().__(message).__(); return; } @@ -136,8 +136,8 @@ public class AppBlock extends HtmlBlock { // Application Kill html.div() .button() - .$onclick("confirmAction()").b("Kill Application")._() - ._(); + .$onclick("confirmAction()").b("Kill Application").__() + .__(); StringBuilder script = new StringBuilder(); script.append("function confirmAction() {") @@ -160,7 +160,7 @@ public class AppBlock extends HtmlBlock { .append(" }") .append("}"); - html.script().$type("text/javascript")._(script.toString())._(); + html.script().$type("text/javascript").__(script.toString()).__(); } String schedulerPath = WebAppUtils.getResolvedRMWebAppURLWithScheme(conf) + @@ -185,13 +185,13 @@ public class AppBlock extends HtmlBlock { String message = "Failed to read the attempts of the application " + appID + "."; LOG.error(message, e); - html.p()._(message)._(); + html.p().__(message).__(); return; } createApplicationMetricsTable(html); - html._(InfoBlock.class); + html.__(InfoBlock.class); generateApplicationTable(html, callerUGI, attempts); @@ -207,25 +207,25 @@ public class AppBlock extends HtmlBlock { private void generateOverviewTable(AppInfo app, String schedulerPath, String webUiType, ApplicationReport appReport) { ResponseInfo overviewTable = info("Application Overview") - ._("User:", schedulerPath, app.getUser()) - ._("Name:", app.getName()) - ._("Application Type:", app.getType()) - ._("Application Tags:", + .__("User:", schedulerPath, app.getUser()) + .__("Name:", app.getName()) + .__("Application Type:", app.getType()) + .__("Application Tags:", app.getApplicationTags() == null ? "" : app.getApplicationTags()) - ._("Application Priority:", clarifyAppPriority(app.getPriority())) - ._( + .__("Application Priority:", clarifyAppPriority(app.getPriority())) + .__( "YarnApplicationState:", app.getAppState() == null ? UNAVAILABLE : clarifyAppState(app .getAppState())) - ._("Queue:", schedulerPath, app.getQueue()) - ._("FinalStatus Reported by AM:", + .__("Queue:", schedulerPath, app.getQueue()) + .__("FinalStatus Reported by AM:", clairfyAppFinalStatus(app.getFinalAppStatus())) - ._("Started:", Times.format(app.getStartedTime())) - ._( + .__("Started:", Times.format(app.getStartedTime())) + .__( "Elapsed:", StringUtils.formatTime(Times.elapsed(app.getStartedTime(), app.getFinishedTime()))) - ._( + .__( "Tracking URL:", app.getTrackingUrl() == null || app.getTrackingUrl().equals(UNAVAILABLE) ? null : root_url(app @@ -240,31 +240,31 @@ public class AppBlock extends HtmlBlock { && webUiType.equals(YarnWebParams.RM_WEB_UI)) { LogAggregationStatus status = getLogAggregationStatus(); if (status == null) { - overviewTable._("Log Aggregation Status:", "N/A"); + overviewTable.__("Log Aggregation Status:", "N/A"); } else if (status == LogAggregationStatus.DISABLED || status == LogAggregationStatus.NOT_START || status == LogAggregationStatus.SUCCEEDED) { - overviewTable._("Log Aggregation Status:", status.name()); + overviewTable.__("Log Aggregation Status:", status.name()); } else { - overviewTable._("Log Aggregation Status:", + overviewTable.__("Log Aggregation Status:", root_url("logaggregationstatus", app.getAppId()), status.name()); } long timeout = appReport.getApplicationTimeouts() .get(ApplicationTimeoutType.LIFETIME).getRemainingTime(); if (timeout < 0) { - overviewTable._("Application Timeout (Remaining Time):", "Unlimited"); + overviewTable.__("Application Timeout (Remaining Time):", "Unlimited"); } else { - overviewTable._("Application Timeout (Remaining Time):", + overviewTable.__("Application Timeout (Remaining Time):", String.format("%d seconds", timeout)); } } - overviewTable._("Diagnostics:", + overviewTable.__("Diagnostics:", app.getDiagnosticsInfo() == null ? "" : app.getDiagnosticsInfo()); - overviewTable._("Unmanaged Application:", app.isUnmanagedApp()); - overviewTable._("Application Node Label expression:", + overviewTable.__("Unmanaged Application:", app.isUnmanagedApp()); + overviewTable.__("Application Node Label expression:", app.getAppNodeLabelExpression() == null ? "<Not set>" : app.getAppNodeLabelExpression()); - overviewTable._("AM container Node Label expression:", + overviewTable.__("AM container Node Label expression:", app.getAmNodeLabelExpression() == null ? "<Not set>" : app.getAmNodeLabelExpression()); } @@ -276,7 +276,7 @@ public class AppBlock extends HtmlBlock { TBODY<TABLE<Hamlet>> tbody = html.table("#attempts").thead().tr().th(".id", "Attempt ID") .th(".started", "Started").th(".node", "Node").th(".logs", "Logs") - ._()._().tbody(); + .__().__().tbody(); StringBuilder attemptsTableData = new StringBuilder("[\n"); for (final ApplicationAttemptReport appAttemptReport : attempts) { @@ -312,7 +312,7 @@ public class AppBlock extends HtmlBlock { "Failed to read the AM container of the application attempt " + appAttemptReport.getApplicationAttemptId() + "."; LOG.error(message, e); - html.p()._(message)._(); + html.p().__(message).__(); return; } long startTime = 0L; @@ -346,9 +346,9 @@ public class AppBlock extends HtmlBlock { } attemptsTableData.append("]"); html.script().$type("text/javascript") - ._("var attemptsTableData=" + attemptsTableData)._(); + .__("var attemptsTableData=" + attemptsTableData).__(); - tbody._()._(); + tbody.__().__(); } private String clarifyAppState(YarnApplicationState state) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppsBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppsBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppsBlock.java index 7f42343..d836e64 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppsBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppsBlock.java @@ -44,9 +44,9 @@ import org.apache.hadoop.yarn.api.records.YarnApplicationState; import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.server.webapp.dao.AppInfo; import org.apache.hadoop.yarn.webapp.BadRequestException; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TABLE; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TBODY; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TABLE; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TBODY; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; import com.google.inject.Inject; @@ -134,7 +134,7 @@ public class AppsBlock extends HtmlBlock { catch( Exception e) { String message = "Failed to read the applications."; LOG.error(message, e); - html.p()._(message)._(); + html.p().__(message).__(); return; } renderData(html); @@ -147,7 +147,7 @@ public class AppsBlock extends HtmlBlock { .th(".queue", "Queue").th(".priority", "Application Priority") .th(".starttime", "StartTime").th(".finishtime", "FinishTime") .th(".state", "State").th(".finalstatus", "FinalStatus") - .th(".progress", "Progress").th(".ui", "Tracking UI")._()._().tbody(); + .th(".progress", "Progress").th(".ui", "Tracking UI").__().__().tbody(); StringBuilder appsTableData = new StringBuilder("[\n"); for (ApplicationReport appReport : appReports) { @@ -218,8 +218,8 @@ public class AppsBlock extends HtmlBlock { } appsTableData.append("]"); html.script().$type("text/javascript") - ._("var appsTableData=" + appsTableData)._(); + .__("var appsTableData=" + appsTableData).__(); - tbody._()._(); + tbody.__().__(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/ContainerBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/ContainerBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/ContainerBlock.java index 893e823..fa35a3d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/ContainerBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/ContainerBlock.java @@ -31,7 +31,6 @@ import org.apache.hadoop.yarn.api.protocolrecords.GetContainerReportRequest; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.ContainerReport; import org.apache.hadoop.yarn.server.webapp.dao.ContainerInfo; -import org.apache.hadoop.yarn.util.ConverterUtils; import org.apache.hadoop.yarn.util.Times; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; import org.apache.hadoop.yarn.webapp.view.InfoBlock; @@ -86,7 +85,7 @@ public class ContainerBlock extends HtmlBlock { } catch (Exception e) { String message = "Failed to read the container " + containerid + "."; LOG.error(message, e); - html.p()._(message)._(); + html.p().__(message).__(); return; } @@ -99,32 +98,32 @@ public class ContainerBlock extends HtmlBlock { setTitle(join("Container ", containerid)); info("Container Overview") - ._( + .__( "Container State:", container.getContainerState() == null ? UNAVAILABLE : container .getContainerState()) - ._("Exit Status:", container.getContainerExitStatus()) - ._( + .__("Exit Status:", container.getContainerExitStatus()) + .__( "Node:", container.getNodeHttpAddress() == null ? "#" : container .getNodeHttpAddress(), container.getNodeHttpAddress() == null ? "N/A" : container .getNodeHttpAddress()) - ._("Priority:", container.getPriority()) - ._("Started:", Times.format(container.getStartedTime())) - ._( + .__("Priority:", container.getPriority()) + .__("Started:", Times.format(container.getStartedTime())) + .__( "Elapsed:", StringUtils.formatTime(Times.elapsed(container.getStartedTime(), container.getFinishedTime()))) - ._( + .__( "Resource:", container.getAllocatedMB() + " Memory, " + container.getAllocatedVCores() + " VCores") - ._("Logs:", container.getLogUrl() == null ? "#" : container.getLogUrl(), + .__("Logs:", container.getLogUrl() == null ? "#" : container.getLogUrl(), container.getLogUrl() == null ? "N/A" : "Logs") - ._("Diagnostics:", container.getDiagnosticsInfo() == null ? + .__("Diagnostics:", container.getDiagnosticsInfo() == null ? "" : container.getDiagnosticsInfo()); - html._(InfoBlock.class); + html.__(InfoBlock.class); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/ErrorsAndWarningsBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/ErrorsAndWarningsBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/ErrorsAndWarningsBlock.java index 56db66c..75f6fcd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/ErrorsAndWarningsBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/ErrorsAndWarningsBlock.java @@ -28,7 +28,7 @@ import org.apache.hadoop.util.Time; import org.apache.hadoop.yarn.security.AdminACLsManager; import org.apache.hadoop.yarn.util.Log4jWarningErrorMetricsAppender; import org.apache.hadoop.yarn.util.Times; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; import java.util.ArrayList; @@ -74,19 +74,19 @@ public class ErrorsAndWarningsBlock extends HtmlBlock { } if (!isAdmin) { - html.div().p()._("This page is for admins only.")._()._(); + html.div().p().__("This page is for admins only.").__().__(); return; } if (log instanceof Log4JLogger) { - html._(ErrorMetrics.class); - html._(WarningMetrics.class); + html.__(ErrorMetrics.class); + html.__(WarningMetrics.class); html.div().button().$onclick("reloadPage()").b("View data for the last ") - ._().select().$id("cutoff").option().$value("60")._("1 min")._() - .option().$value("300")._("5 min")._().option().$value("900") - ._("15 min")._().option().$value("3600")._("1 hour")._().option() - .$value("21600")._("6 hours")._().option().$value("43200") - ._("12 hours")._().option().$value("86400")._("24 hours")._()._()._(); + .__().select().$id("cutoff").option().$value("60").__("1 min").__() + .option().$value("300").__("5 min").__().option().$value("900") + .__("15 min").__().option().$value("3600").__("1 hour").__().option() + .$value("21600").__("6 hours").__().option().$value("43200") + .__("12 hours").__().option().$value("86400").__("24 hours").__().__().__(); String script = "function reloadPage() {" + " var timePeriod = $(\"#cutoff\").val();" @@ -97,7 +97,7 @@ public class ErrorsAndWarningsBlock extends HtmlBlock { + " $(element).parent().siblings('.toggle-content').fadeToggle();" + "}"; - html.script().$type("text/javascript")._(script)._(); + html.script().$type("text/javascript").__(script).__(); html.style(".toggle-content { display: none; }"); @@ -110,7 +110,7 @@ public class ErrorsAndWarningsBlock extends HtmlBlock { Hamlet.TBODY<Hamlet.TABLE<Hamlet>> errorsTable = html.table("#messages").thead().tr().th(".message", "Message") .th(".type", "Type").th(".count", "Count") - .th(".lasttime", "Latest Message Time")._()._().tbody(); + .th(".lasttime", "Latest Message Time").__().__().tbody(); // cutoff has to be in seconds cutoff.add((Time.now() - cutoffPeriodSeconds * 1000) / 1000); @@ -145,18 +145,18 @@ public class ErrorsAndWarningsBlock extends HtmlBlock { } cell.pre().a().$href("#").$onclick("toggleContent(this);") - .$style("white-space: pre")._(displayMessage)._()._().div() - .$class("toggle-content").pre()._(message)._()._()._(); + .$style("white-space: pre").__(displayMessage).__().__().div() + .$class("toggle-content").pre().__(message).__().__().__(); } else { - cell.pre()._(message)._()._(); + cell.pre().__(message).__().__(); } Log4jWarningErrorMetricsAppender.Element ele = entry.getValue(); row.td(type).td(String.valueOf(ele.count)) - .td(Times.format(ele.timestampSeconds * 1000))._(); + .td(Times.format(ele.timestampSeconds * 1000)).__(); } } } - errorsTable._()._(); + errorsTable.__().__(); } } @@ -199,19 +199,19 @@ public class ErrorsAndWarningsBlock extends HtmlBlock { html.div().$class("metrics").$style("padding-bottom: 20px"); div.h3(tableHeading).table("#metricsoverview").thead() .$class("ui-widget-header").tr().th().$class("ui-state-default") - ._("Last 1 minute")._().th().$class("ui-state-default") - ._("Last 5 minutes")._().th().$class("ui-state-default") - ._("Last 15 minutes")._().th().$class("ui-state-default") - ._("Last 1 hour")._().th().$class("ui-state-default") - ._("Last 6 hours")._().th().$class("ui-state-default") - ._("Last 12 hours")._().th().$class("ui-state-default") - ._("Last 24 hours")._()._()._().tbody().$class("ui-widget-content") + .__("Last 1 minute").__().th().$class("ui-state-default") + .__("Last 5 minutes").__().th().$class("ui-state-default") + .__("Last 15 minutes").__().th().$class("ui-state-default") + .__("Last 1 hour").__().th().$class("ui-state-default") + .__("Last 6 hours").__().th().$class("ui-state-default") + .__("Last 12 hours").__().th().$class("ui-state-default") + .__("Last 24 hours").__().__().__().tbody().$class("ui-widget-content") .tr().td(String.valueOf(values.get(0))) .td(String.valueOf(values.get(1))).td(String.valueOf(values.get(2))) .td(String.valueOf(values.get(3))).td(String.valueOf(values.get(4))) .td(String.valueOf(values.get(5))).td(String.valueOf(values.get(6))) - ._()._()._(); - div._(); + .__().__().__(); + div.__(); } } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllApplicationsPage.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllApplicationsPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllApplicationsPage.java index d32b271..6425da6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllApplicationsPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllApplicationsPage.java @@ -31,17 +31,17 @@ import org.apache.hadoop.yarn.server.nodemanager.containermanager.application.Ap import org.apache.hadoop.yarn.server.nodemanager.webapp.dao.AppInfo; import org.apache.hadoop.yarn.webapp.SubView; import org.apache.hadoop.yarn.webapp.YarnWebParams; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.BODY; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TABLE; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TBODY; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.BODY; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TABLE; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TBODY; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; import com.google.inject.Inject; public class AllApplicationsPage extends NMView { - @Override protected void preHead(Page.HTML<_> html) { + @Override protected void preHead(Page.HTML<__> html) { commonPreHead(html); setTitle("Applications running on this node"); set(DATATABLES_ID, "applications"); @@ -88,22 +88,22 @@ public class AllApplicationsPage extends NMView { .table("#applications") .thead() .tr() - .td()._("ApplicationId")._() - .td()._("ApplicationState")._() - ._() - ._() + .td().__("ApplicationId").__() + .td().__("ApplicationState").__() + .__() + .__() .tbody(); for (Entry<ApplicationId, Application> entry : this.nmContext .getApplications().entrySet()) { AppInfo info = new AppInfo(entry.getValue()); tableBody .tr() - .td().a(url("application", info.getId()), info.getId())._() - .td()._(info.getState()) - ._() - ._(); + .td().a(url("application", info.getId()), info.getId()).__() + .td().__(info.getState()) + .__() + .__(); } - tableBody._()._()._(); + tableBody.__().__().__(); } } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllContainersPage.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllContainersPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllContainersPage.java index 24b8575..3fc6f3c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllContainersPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllContainersPage.java @@ -31,17 +31,17 @@ import org.apache.hadoop.yarn.server.nodemanager.containermanager.container.Cont import org.apache.hadoop.yarn.server.nodemanager.webapp.dao.ContainerInfo; import org.apache.hadoop.yarn.webapp.SubView; import org.apache.hadoop.yarn.webapp.YarnWebParams; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.BODY; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TABLE; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TBODY; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.BODY; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TABLE; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TBODY; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; import com.google.inject.Inject; public class AllContainersPage extends NMView { - @Override protected void preHead(Page.HTML<_> html) { + @Override protected void preHead(Page.HTML<__> html) { commonPreHead(html); setTitle("All containers running on this node"); set(DATATABLES_ID, "containers"); @@ -82,24 +82,24 @@ public class AllContainersPage extends NMView { .table("#containers") .thead() .tr() - .td()._("ContainerId")._() - .td()._("ContainerState")._() - .td()._("logs")._() - ._() - ._().tbody(); + .td().__("ContainerId").__() + .td().__("ContainerState").__() + .td().__("logs").__() + .__() + .__().tbody(); for (Entry<ContainerId, Container> entry : this.nmContext .getContainers().entrySet()) { ContainerInfo info = new ContainerInfo(this.nmContext, entry.getValue()); tableBody .tr() .td().a(url("container", info.getId()), info.getId()) - ._() - .td()._(info.getState())._() + .__() + .td().__(info.getState()).__() .td() - .a(url(info.getShortLogLink()), "logs")._() - ._(); + .a(url(info.getShortLogLink()), "logs").__() + .__(); } - tableBody._()._()._(); + tableBody.__().__().__(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ApplicationPage.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ApplicationPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ApplicationPage.java index 2783b18..00f80ef 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ApplicationPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ApplicationPage.java @@ -30,12 +30,11 @@ import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider; import org.apache.hadoop.yarn.server.nodemanager.Context; import org.apache.hadoop.yarn.server.nodemanager.containermanager.application.Application; import org.apache.hadoop.yarn.server.nodemanager.webapp.dao.AppInfo; -import org.apache.hadoop.yarn.util.ConverterUtils; import org.apache.hadoop.yarn.webapp.SubView; import org.apache.hadoop.yarn.webapp.YarnWebParams; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.DIV; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TABLE; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.DIV; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TABLE; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; import org.apache.hadoop.yarn.webapp.view.InfoBlock; @@ -43,7 +42,7 @@ import com.google.inject.Inject; public class ApplicationPage extends NMView implements YarnWebParams { - @Override protected void preHead(Page.HTML<_> html) { + @Override protected void preHead(Page.HTML<__> html) { commonPreHead(html); set(DATATABLES_ID, "containers"); @@ -80,30 +79,30 @@ public class ApplicationPage extends NMView implements YarnWebParams { try { applicationID = ApplicationId.fromString($(APPLICATION_ID)); } catch (IllegalArgumentException e) { - html.p()._("Invalid Application Id " + $(APPLICATION_ID))._(); + html.p().__("Invalid Application Id " + $(APPLICATION_ID)).__(); return; } DIV<Hamlet> div = html.div("#content"); Application app = this.nmContext.getApplications().get(applicationID); if (app == null) { div.h1("Unknown application with id " + applicationID - + ". Application might have been completed")._(); + + ". Application might have been completed").__(); return; } AppInfo info = new AppInfo(app); info("Application's information") - ._("ApplicationId", info.getId()) - ._("ApplicationState", info.getState()) - ._("User", info.getUser()); - TABLE<Hamlet> containersListBody = html._(InfoBlock.class) + .__("ApplicationId", info.getId()) + .__("ApplicationState", info.getState()) + .__("User", info.getUser()); + TABLE<Hamlet> containersListBody = html.__(InfoBlock.class) .table("#containers"); for (String containerIdStr : info.getContainers()) { containersListBody .tr().td() .a(url("container", containerIdStr), containerIdStr) - ._()._(); + .__().__(); } - containersListBody._(); + containersListBody.__(); } } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ContainerLogsPage.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ContainerLogsPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ContainerLogsPage.java index 3e5f4d2..f619e2f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ContainerLogsPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ContainerLogsPage.java @@ -37,12 +37,11 @@ import org.apache.hadoop.io.IOUtils; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.server.nodemanager.Context; -import org.apache.hadoop.yarn.util.ConverterUtils; import org.apache.hadoop.yarn.webapp.NotFoundException; import org.apache.hadoop.yarn.webapp.SubView; import org.apache.hadoop.yarn.webapp.YarnWebParams; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.PRE; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.PRE; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; import com.google.inject.Inject; @@ -51,7 +50,7 @@ public class ContainerLogsPage extends NMView { public static final String REDIRECT_URL = "redirect.url"; - @Override protected void preHead(Page.HTML<_> html) { + @Override protected void preHead(Page.HTML<__> html) { String redirectUrl = $(REDIRECT_URL); if (redirectUrl == null || redirectUrl.isEmpty()) { set(TITLE, join("Logs for ", $(CONTAINER_ID))); @@ -142,10 +141,10 @@ public class ContainerLogsPage extends NMView { try { long toRead = end - start; if (toRead < logFile.length()) { - html.p()._("Showing " + toRead + " bytes. Click ") + html.p().__("Showing " + toRead + " bytes. Click ") .a(url("containerlogs", $(CONTAINER_ID), $(APP_OWNER), logFile.getName(), "?start=0"), "here"). - _(" for full log")._(); + __(" for full log").__(); } IOUtils.skipFully(logByteStream, start); @@ -160,12 +159,12 @@ public class ContainerLogsPage extends NMView { while ((len = reader.read(cbuf, 0, currentToRead)) > 0 && toRead > 0) { - pre._(new String(cbuf, 0, len)); + pre.__(new String(cbuf, 0, len)); toRead = toRead - len; currentToRead = toRead > bufferSize ? bufferSize : (int) toRead; } - pre._(); + pre.__(); reader.close(); } catch (IOException e) { @@ -199,7 +198,7 @@ public class ContainerLogsPage extends NMView { .a(url("containerlogs", $(CONTAINER_ID), $(APP_OWNER), logFile.getName(), "?start=-4096"), logFile.getName() + " : Total file length is " - + logFile.length() + " bytes.")._(); + + logFile.length() + " bytes.").__(); } } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ContainerPage.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ContainerPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ContainerPage.java index 4beccc9..8117dca 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ContainerPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ContainerPage.java @@ -25,11 +25,10 @@ import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.server.nodemanager.Context; import org.apache.hadoop.yarn.server.nodemanager.containermanager.container.Container; import org.apache.hadoop.yarn.server.nodemanager.webapp.dao.ContainerInfo; -import org.apache.hadoop.yarn.util.ConverterUtils; import org.apache.hadoop.yarn.webapp.SubView; import org.apache.hadoop.yarn.webapp.YarnWebParams; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.DIV; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.DIV; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; import org.apache.hadoop.yarn.webapp.view.InfoBlock; @@ -38,7 +37,7 @@ import com.google.inject.Inject; public class ContainerPage extends NMView implements YarnWebParams { @Override - protected void preHead(Page.HTML<_> html) { + protected void preHead(Page.HTML<__> html) { commonPreHead(html); setTitle("Container " + $(CONTAINER_ID)); @@ -65,7 +64,7 @@ public class ContainerPage extends NMView implements YarnWebParams { try { containerID = ContainerId.fromString($(CONTAINER_ID)); } catch (IllegalArgumentException e) { - html.p()._("Invalid containerId " + $(CONTAINER_ID))._(); + html.p().__("Invalid containerId " + $(CONTAINER_ID)).__(); return; } @@ -73,22 +72,22 @@ public class ContainerPage extends NMView implements YarnWebParams { Container container = this.nmContext.getContainers().get(containerID); if (container == null) { div.h1("Unknown Container. Container might have completed, " - + "please go back to the previous page and retry.")._(); + + "please go back to the previous page and retry.").__(); return; } ContainerInfo info = new ContainerInfo(this.nmContext, container); info("Container information") - ._("ContainerID", info.getId()) - ._("ContainerState", info.getState()) - ._("ExitStatus", info.getExitStatus()) - ._("Diagnostics", info.getDiagnostics()) - ._("User", info.getUser()) - ._("TotalMemoryNeeded", info.getMemoryNeeded()) - ._("TotalVCoresNeeded", info.getVCoresNeeded()) - ._("ExecutionType", info.getExecutionType()) - ._("logs", info.getShortLogLink(), "Link to logs"); - html._(InfoBlock.class); + .__("ContainerID", info.getId()) + .__("ContainerState", info.getState()) + .__("ExitStatus", info.getExitStatus()) + .__("Diagnostics", info.getDiagnostics()) + .__("User", info.getUser()) + .__("TotalMemoryNeeded", info.getMemoryNeeded()) + .__("TotalVCoresNeeded", info.getVCoresNeeded()) + .__("ExecutionType", info.getExecutionType()) + .__("logs", info.getShortLogLink(), "Link to logs"); + html.__(InfoBlock.class); } } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
