hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aajis...@apache.org
Subject [8/8] hadoop git commit: HADOOP-11875. [JDK9] Adding a second copy of Hamlet without _ as a one-character identifier.
Date Fri, 28 Jul 2017 00:11:09 GMT
HADOOP-11875. [JDK9] Adding a second copy of Hamlet without _ as a one-character identifier.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/38c6fa5c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/38c6fa5c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/38c6fa5c

Branch: refs/heads/trunk
Commit: 38c6fa5c7a61c7f6d4d2db5f12f9c60d477fb397
Parents: c6330f2
Author: Akira Ajisaka <aajisaka@apache.org>
Authored: Fri Jul 28 08:57:34 2017 +0900
Committer: Akira Ajisaka <aajisaka@apache.org>
Committed: Fri Jul 28 09:10:52 2017 +0900

----------------------------------------------------------------------
 .../mapreduce/v2/app/webapp/AppController.java  |    10 +-
 .../hadoop/mapreduce/v2/app/webapp/AppView.java |     4 +-
 .../mapreduce/v2/app/webapp/ConfBlock.java      |    36 +-
 .../mapreduce/v2/app/webapp/CountersBlock.java  |    38 +-
 .../mapreduce/v2/app/webapp/CountersPage.java   |     4 +-
 .../mapreduce/v2/app/webapp/InfoPage.java       |     2 +-
 .../mapreduce/v2/app/webapp/JobBlock.java       |    95 +-
 .../mapreduce/v2/app/webapp/JobConfPage.java    |     3 +-
 .../hadoop/mapreduce/v2/app/webapp/JobPage.java |     2 +-
 .../mapreduce/v2/app/webapp/JobsBlock.java      |    24 +-
 .../mapreduce/v2/app/webapp/NavBlock.java       |    38 +-
 .../v2/app/webapp/SingleCounterBlock.java       |    28 +-
 .../v2/app/webapp/SingleCounterPage.java        |     3 +-
 .../mapreduce/v2/app/webapp/TaskPage.java       |    20 +-
 .../mapreduce/v2/app/webapp/TasksBlock.java     |    12 +-
 .../mapreduce/v2/app/webapp/TasksPage.java      |     2 +-
 .../mapreduce/v2/hs/webapp/HsAboutPage.java     |     7 +-
 .../mapreduce/v2/hs/webapp/HsConfPage.java      |     2 +-
 .../mapreduce/v2/hs/webapp/HsCountersPage.java  |     4 +-
 .../mapreduce/v2/hs/webapp/HsJobBlock.java      |    98 +-
 .../mapreduce/v2/hs/webapp/HsJobPage.java       |     2 +-
 .../mapreduce/v2/hs/webapp/HsJobsBlock.java     |    46 +-
 .../mapreduce/v2/hs/webapp/HsLogsPage.java      |     2 +-
 .../mapreduce/v2/hs/webapp/HsNavBlock.java      |    30 +-
 .../v2/hs/webapp/HsSingleCounterPage.java       |     2 +-
 .../mapreduce/v2/hs/webapp/HsTaskPage.java      |    53 +-
 .../mapreduce/v2/hs/webapp/HsTasksBlock.java    |    57 +-
 .../mapreduce/v2/hs/webapp/HsTasksPage.java     |     2 +-
 .../hadoop/mapreduce/v2/hs/webapp/HsView.java   |     4 +-
 .../hadoop-yarn/hadoop-yarn-common/pom.xml      |    22 +
 .../apache/hadoop/yarn/webapp/ResponseInfo.java |     4 +-
 .../hadoop/yarn/webapp/example/HelloWorld.java  |     4 +-
 .../hadoop/yarn/webapp/example/MyApp.java       |     6 +-
 .../hadoop/yarn/webapp/hamlet/Hamlet.java       |     4 +
 .../hadoop/yarn/webapp/hamlet/HamletGen.java    |     2 +
 .../hadoop/yarn/webapp/hamlet/HamletImpl.java   |     2 +
 .../hadoop/yarn/webapp/hamlet/HamletSpec.java   |     2 +
 .../hadoop/yarn/webapp/hamlet/package-info.java |     6 +
 .../hadoop/yarn/webapp/hamlet2/Hamlet.java      | 30557 +++++++++++++++++
 .../hadoop/yarn/webapp/hamlet2/HamletGen.java   |   449 +
 .../hadoop/yarn/webapp/hamlet2/HamletImpl.java  |   385 +
 .../hadoop/yarn/webapp/hamlet2/HamletSpec.java  |  3101 ++
 .../yarn/webapp/hamlet2/package-info.java       |    27 +
 .../yarn/webapp/log/AggregatedLogsBlock.java    |    66 +-
 .../yarn/webapp/log/AggregatedLogsNavBlock.java |     4 +-
 .../yarn/webapp/log/AggregatedLogsPage.java     |     2 +-
 .../hadoop/yarn/webapp/view/ErrorPage.java      |    12 +-
 .../hadoop/yarn/webapp/view/FooterBlock.java    |     2 +-
 .../hadoop/yarn/webapp/view/HeaderBlock.java    |     6 +-
 .../hadoop/yarn/webapp/view/HtmlBlock.java      |     2 +-
 .../hadoop/yarn/webapp/view/HtmlPage.java       |    12 +-
 .../hadoop/yarn/webapp/view/InfoBlock.java      |    28 +-
 .../hadoop/yarn/webapp/view/JQueryUI.java       |    14 +-
 .../hadoop/yarn/webapp/view/LipsumBlock.java    |     4 +-
 .../hadoop/yarn/webapp/view/NavBlock.java       |    10 +-
 .../yarn/webapp/view/TwoColumnCssLayout.java    |    20 +-
 .../yarn/webapp/view/TwoColumnLayout.java       |    20 +-
 .../apache/hadoop/yarn/webapp/TestSubViews.java |    10 +-
 .../apache/hadoop/yarn/webapp/TestWebApp.java   |    28 +-
 .../hadoop/yarn/webapp/view/TestHtmlBlock.java  |    10 +-
 .../hadoop/yarn/webapp/view/TestHtmlPage.java   |     9 +-
 .../hadoop/yarn/webapp/view/TestInfoBlock.java  |     6 +-
 .../yarn/webapp/view/TestTwoColumnCssPage.java  |     6 +-
 .../webapp/AHSErrorsAndWarningsPage.java        |     2 +-
 .../webapp/AHSLogsPage.java                     |     2 +-
 .../webapp/AHSView.java                         |     4 +-
 .../webapp/AboutBlock.java                      |     8 +-
 .../webapp/AboutPage.java                       |     5 +-
 .../webapp/AppAttemptPage.java                  |     2 +-
 .../webapp/AppPage.java                         |     2 +-
 .../webapp/ContainerPage.java                   |     2 +-
 .../webapp/NavBlock.java                        |    28 +-
 .../yarn/server/webapp/AppAttemptBlock.java     |    31 +-
 .../hadoop/yarn/server/webapp/AppBlock.java     |    66 +-
 .../hadoop/yarn/server/webapp/AppsBlock.java    |    14 +-
 .../yarn/server/webapp/ContainerBlock.java      |    23 +-
 .../server/webapp/ErrorsAndWarningsBlock.java   |    50 +-
 .../nodemanager/webapp/AllApplicationsPage.java |    28 +-
 .../nodemanager/webapp/AllContainersPage.java   |    30 +-
 .../nodemanager/webapp/ApplicationPage.java     |    25 +-
 .../nodemanager/webapp/ContainerLogsPage.java   |    17 +-
 .../nodemanager/webapp/ContainerPage.java       |    31 +-
 .../webapp/NMErrorsAndWarningsPage.java         |     2 +-
 .../yarn/server/nodemanager/webapp/NMView.java  |     4 +-
 .../server/nodemanager/webapp/NavBlock.java     |    28 +-
 .../server/nodemanager/webapp/NodePage.java     |    28 +-
 .../resourcemanager/webapp/AboutBlock.java      |    20 +-
 .../resourcemanager/webapp/AboutPage.java       |     2 +-
 .../resourcemanager/webapp/AppAttemptPage.java  |     2 +-
 .../webapp/AppLogAggregationStatusPage.java     |     2 +-
 .../server/resourcemanager/webapp/AppPage.java  |     2 +-
 .../webapp/AppsBlockWithMetrics.java            |     5 +-
 .../webapp/CapacitySchedulerPage.java           |   220 +-
 .../resourcemanager/webapp/ContainerPage.java   |     2 +-
 .../webapp/DefaultSchedulerPage.java            |    58 +-
 .../resourcemanager/webapp/ErrorBlock.java      |     2 +-
 .../webapp/FairSchedulerAppsBlock.java          |    12 +-
 .../webapp/FairSchedulerPage.java               |   116 +-
 .../webapp/MetricsOverviewTable.java            |   124 +-
 .../server/resourcemanager/webapp/NavBlock.java |    34 +-
 .../resourcemanager/webapp/NodeLabelsPage.java  |    18 +-
 .../resourcemanager/webapp/NodesPage.java       |    16 +-
 .../webapp/RMAppAttemptBlock.java               |    48 +-
 .../resourcemanager/webapp/RMAppBlock.java      |    28 +-
 .../webapp/RMAppLogAggregationStatusBlock.java  |    34 +-
 .../resourcemanager/webapp/RMAppsBlock.java     |    15 +-
 .../webapp/RMErrorsAndWarningsPage.java         |     2 +-
 .../webapp/RedirectionErrorPage.java            |     2 +-
 .../server/resourcemanager/webapp/RmView.java   |     4 +-
 .../webapp/SchedulerPageUtil.java               |     8 +-
 .../webapp/SCMOverviewPage.java                 |    26 +-
 .../hadoop/yarn/server/webproxy/ProxyUtils.java |    16 +-
 .../server/webproxy/WebAppProxyServlet.java     |    14 +-
 113 files changed, 35635 insertions(+), 1101 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java
index 1c90cb9..6db1274 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java
@@ -84,11 +84,11 @@ public class AppController extends Controller implements AMParams {
   public void info() {
     AppInfo info = new AppInfo(app, app.context);
     info("Application Master Overview").
-      _("Application ID:", info.getId()).
-      _("Application Name:", info.getName()).
-      _("User:", info.getUser()).
-      _("Started on:", Times.format(info.getStartTime())).
-      _("Elasped: ", org.apache.hadoop.util.StringUtils.formatTime(
+        __("Application ID:", info.getId()).
+        __("Application Name:", info.getName()).
+        __("User:", info.getUser()).
+        __("Started on:", Times.format(info.getStartTime())).
+        __("Elasped: ", org.apache.hadoop.util.StringUtils.formatTime(
           info.getElapsedTime() ));
     render(InfoPage.class);
   }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppView.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppView.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppView.java
index 7fde95b..7a3e2b3 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppView.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppView.java
@@ -25,14 +25,14 @@ import static org.apache.hadoop.yarn.webapp.view.JQueryUI.*;
 
 public class AppView extends TwoColumnLayout {
 
-  @Override protected void preHead(Page.HTML<_> html) {
+  @Override protected void preHead(Page.HTML<__> html) {
     commonPreHead(html);
     set(DATATABLES_ID, "jobs");
     set(initID(DATATABLES, "jobs"), jobsTableInit());
     setTableStyles(html, "jobs");
   }
 
-  protected void commonPreHead(Page.HTML<_> html) {
+  protected void commonPreHead(Page.HTML<__> html) {
     set(ACCORDION_ID, "nav");
     set(initID(ACCORDION, "nav"), "{autoHeight:false, active:1}");
   }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/ConfBlock.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/ConfBlock.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/ConfBlock.java
index 98a2ce1..76ef6bd 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/ConfBlock.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/ConfBlock.java
@@ -30,10 +30,10 @@ import org.apache.hadoop.mapreduce.v2.app.job.Job;
 import org.apache.hadoop.mapreduce.v2.app.webapp.dao.ConfEntryInfo;
 import org.apache.hadoop.mapreduce.v2.app.webapp.dao.ConfInfo;
 import org.apache.hadoop.mapreduce.v2.util.MRApps;
-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.hamlet.HamletSpec.InputType;
+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.hamlet2.HamletSpec.InputType;
 import org.apache.hadoop.yarn.webapp.view.HtmlBlock;
 
 import com.google.inject.Inject;
@@ -56,21 +56,21 @@ public class ConfBlock extends HtmlBlock {
     String jid = $(JOB_ID);
     if (jid.isEmpty()) {
       html.
-        p()._("Sorry, can't do anything without a JobID.")._();
+        p().__("Sorry, can't do anything without a JobID.").__();
       return;
     }
     JobId jobID = MRApps.toJobID(jid);
     Job job = appContext.getJob(jobID);
     if (job == null) {
       html.
-        p()._("Sorry, ", jid, " not found.")._();
+        p().__("Sorry, ", jid, " not found.").__();
       return;
     }
     Path confPath = job.getConfFile();
     try {
       ConfInfo info = new ConfInfo(job);
 
-      html.div().a("/jobhistory/downloadconf/" + jid, confPath.toString())._();
+      html.div().a("/jobhistory/downloadconf/" + jid, confPath.toString()).__();
       TBODY<TABLE<Hamlet>> tbody = html.
         // Tasks table
       table("#conf").
@@ -79,8 +79,8 @@ public class ConfBlock extends HtmlBlock {
             th(_TH, "key").
             th(_TH, "value").
             th(_TH, "source chain").
-          _().
-        _().
+              __().
+              __().
       tbody();
       for (ConfEntryInfo entry : info.getProperties()) {
         StringBuffer buffer = new StringBuffer();
@@ -100,20 +100,20 @@ public class ConfBlock extends HtmlBlock {
             td(entry.getName()).
             td(entry.getValue()).
             td(buffer.toString()).
-          _();
+            __();
       }
-      tbody._().
+      tbody.__().
       tfoot().
         tr().
-          th().input("search_init").$type(InputType.text).$name("key").$value("key")._()._().
-          th().input("search_init").$type(InputType.text).$name("value").$value("value")._()._().
-          th().input("search_init").$type(InputType.text).$name("source chain").$value("source chain")._()._().
-          _().
-        _().
-      _();
+          th().input("search_init").$type(InputType.text).$name("key").$value("key").__().__().
+          th().input("search_init").$type(InputType.text).$name("value").$value("value").__().__().
+          th().input("search_init").$type(InputType.text).$name("source chain").$value("source chain").__().__().
+          __().
+          __().
+          __();
     } catch(IOException e) {
       LOG.error("Error while reading "+confPath, e);
-      html.p()._("Sorry got an error while reading conf file. ",confPath);
+      html.p().__("Sorry got an error while reading conf file. ", confPath);
     }
   }
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/CountersBlock.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/CountersBlock.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/CountersBlock.java
index 568658e..4b9e6f4 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/CountersBlock.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/CountersBlock.java
@@ -34,13 +34,13 @@ import org.apache.hadoop.mapreduce.v2.app.AppContext;
 import org.apache.hadoop.mapreduce.v2.app.job.Job;
 import org.apache.hadoop.mapreduce.v2.app.job.Task;
 import org.apache.hadoop.mapreduce.v2.util.MRApps;
-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.TBODY;
-import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TD;
-import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.THEAD;
-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.TBODY;
+import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TD;
+import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.THEAD;
+import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TR;
 import org.apache.hadoop.yarn.webapp.view.HtmlBlock;
 
 import com.google.inject.Inject;
@@ -60,12 +60,12 @@ public class CountersBlock extends HtmlBlock {
   @Override protected void render(Block html) {
     if (job == null) {
       html.
-        p()._("Sorry, no counters for nonexistent", $(JOB_ID, "job"))._();
+        p().__("Sorry, no counters for nonexistent", $(JOB_ID, "job")).__();
       return;
     }
     if (!$(TASK_ID).isEmpty() && task == null) {
       html.
-        p()._("Sorry, no counters for nonexistent", $(TASK_ID, "task"))._();
+        p().__("Sorry, no counters for nonexistent", $(TASK_ID, "task")).__();
       return;
     }
     
@@ -75,7 +75,7 @@ public class CountersBlock extends HtmlBlock {
         type = $(JOB_ID, "the job");
       }
       html.
-        p()._("Sorry it looks like ",type," has no counters.")._();
+        p().__("Sorry it looks like ", type, " has no counters.").__();
       return;
     }
     
@@ -97,7 +97,7 @@ public class CountersBlock extends HtmlBlock {
         thead().
           tr().
             th(".group.ui-state-default", "Counter Group").
-            th(".ui-state-default", "Counters")._()._().
+            th(".ui-state-default", "Counters").__().__().
         tbody();
     for (CounterGroup g : total) {
       CounterGroup mg = map == null ? null : map.getGroup(g.getName());
@@ -109,7 +109,7 @@ public class CountersBlock extends HtmlBlock {
       TR<THEAD<TABLE<TD<TR<TBODY<TABLE<DIV<Hamlet>>>>>>>> groupHeadRow = tbody.
         tr().
           th().$title(g.getName()).$class("ui-state-default").
-            _(fixGroupDisplayName(g.getDisplayName()))._().
+          __(fixGroupDisplayName(g.getDisplayName())).__().
           td().$class(C_TABLE).
             table(".dt-counters").$id(job.getID()+"."+g.getName()).
               thead().
@@ -120,20 +120,20 @@ public class CountersBlock extends HtmlBlock {
       }
       // Ditto
       TBODY<TABLE<TD<TR<TBODY<TABLE<DIV<Hamlet>>>>>>> group = groupHeadRow.
-            th(map == null ? "Value" : "Total")._()._().
+            th(map == null ? "Value" : "Total").__().__().
         tbody();
       for (Counter counter : g) {
         // Ditto
         TR<TBODY<TABLE<TD<TR<TBODY<TABLE<DIV<Hamlet>>>>>>>> groupRow = group.
           tr();
           if (task == null && mg == null && rg == null) {
-            groupRow.td().$title(counter.getName())._(counter.getDisplayName()).
-            _();
+            groupRow.td().$title(counter.getName()).__(counter.getDisplayName()).
+                __();
           } else {
             groupRow.td().$title(counter.getName()).
               a(url(urlBase,urlId,g.getName(), 
                   counter.getName()), counter.getDisplayName()).
-            _();
+                __();
           }
         if (map != null) {
           Counter mc = mg == null ? null : mg.findCounter(counter.getName());
@@ -142,11 +142,11 @@ public class CountersBlock extends HtmlBlock {
             td(mc == null ? "0" : String.format("%,d", mc.getValue())).
             td(rc == null ? "0" : String.format("%,d", rc.getValue()));
         }
-        groupRow.td(String.format("%,d", counter.getValue()))._();
+        groupRow.td(String.format("%,d", counter.getValue())).__();
       }
-      group._()._()._()._();
+      group.__().__().__().__();
     }
-    tbody._()._()._();
+    tbody.__().__().__();
   }
 
   private void getCounters(AppContext ctx) {

http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/CountersPage.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/CountersPage.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/CountersPage.java
index d7afcd8..e780907 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/CountersPage.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/CountersPage.java
@@ -25,7 +25,7 @@ import static org.apache.hadoop.yarn.webapp.view.JQueryUI.*;
 
 public class CountersPage extends AppView {
 
-  @Override protected void preHead(Page.HTML<_> html) {
+  @Override protected void preHead(Page.HTML<__> html) {
     commonPreHead(html);
 
     String tid = $(TASK_ID);
@@ -39,7 +39,7 @@ public class CountersPage extends AppView {
         "{bJQueryUI:true, sDom:'t', iDisplayLength:-1}");
   }
 
-  @Override protected void postHead(Page.HTML<_> html) {
+  @Override protected void postHead(Page.HTML<__> html) {
     html.
       style("#counters, .dt-counters { table-layout: fixed }",
             "#counters th { overflow: hidden; vertical-align: middle }",

http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/InfoPage.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/InfoPage.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/InfoPage.java
index 5163a01..3dd64f5 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/InfoPage.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/InfoPage.java
@@ -23,7 +23,7 @@ import org.apache.hadoop.yarn.webapp.view.InfoBlock;
 
 public class InfoPage extends AppView {
 
-  @Override protected void preHead(Page.HTML<_> html) {
+  @Override protected void preHead(Page.HTML<__> html) {
     commonPreHead(html);
     setTitle("About the Application Master");
   }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobBlock.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobBlock.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobBlock.java
index a599870..77ea55e 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobBlock.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobBlock.java
@@ -30,7 +30,6 @@ import static org.apache.hadoop.yarn.webapp.view.JQueryUI._TH;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.hadoop.http.HttpConfig;
 import org.apache.hadoop.mapreduce.v2.api.records.AMInfo;
 import org.apache.hadoop.mapreduce.v2.api.records.JobId;
 import org.apache.hadoop.mapreduce.v2.app.AppContext;
@@ -41,9 +40,9 @@ import org.apache.hadoop.mapreduce.v2.util.MRApps;
 import org.apache.hadoop.mapreduce.v2.util.MRApps.TaskAttemptStateUI;
 import org.apache.hadoop.mapreduce.v2.util.MRWebAppUtil;
 import org.apache.hadoop.util.StringUtils;
-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;
 
@@ -60,14 +59,14 @@ public class JobBlock extends HtmlBlock {
     String jid = $(JOB_ID);
     if (jid.isEmpty()) {
       html.
-        p()._("Sorry, can't do anything without a JobID.")._();
+        p().__("Sorry, can't do anything without a JobID.").__();
       return;
     }
     JobId jobID = MRApps.toJobID(jid);
     Job job = appContext.getJob(jobID);
     if (job == null) {
       html.
-        p()._("Sorry, ", jid, " not found.")._();
+        p().__("Sorry, ", jid, " not found.").__();
       return;
     }
 
@@ -77,15 +76,15 @@ public class JobBlock extends HtmlBlock {
 
     JobInfo jinfo = new JobInfo(job, true);
     info("Job Overview").
-        _("Job Name:", jinfo.getName()).
-        _("User Name:", jinfo.getUserName()).
-        _("Queue Name:", jinfo.getQueueName()).
-        _("State:", jinfo.getState()).
-        _("Uberized:", jinfo.isUberized()).
-        _("Started:", new Date(jinfo.getStartTime())).
-        _("Elapsed:", StringUtils.formatTime(jinfo.getElapsedTime()));
+        __("Job Name:", jinfo.getName()).
+        __("User Name:", jinfo.getUserName()).
+        __("Queue Name:", jinfo.getQueueName()).
+        __("State:", jinfo.getState()).
+        __("Uberized:", jinfo.isUberized()).
+        __("Started:", new Date(jinfo.getStartTime())).
+        __("Elapsed:", StringUtils.formatTime(jinfo.getElapsedTime()));
     DIV<Hamlet> div = html.
-      _(InfoBlock.class).
+        __(InfoBlock.class).
       div(_INFO_WRAP);
 
     // MRAppMasters Table
@@ -93,13 +92,13 @@ public class JobBlock extends HtmlBlock {
     table.
       tr().
       th(amString).
-      _().
+        __().
       tr().
       th(_TH, "Attempt Number").
       th(_TH, "Start Time").
       th(_TH, "Node").
       th(_TH, "Logs").
-      _();
+        __();
     for (AMInfo amInfo : amInfos) {
       AMAttemptInfo attempt = new AMAttemptInfo(amInfo,
           jinfo.getId(), jinfo.getUserName());
@@ -109,14 +108,14 @@ public class JobBlock extends HtmlBlock {
         td(new Date(attempt.getStartTime()).toString()).
         td().a(".nodelink", url(MRWebAppUtil.getYARNWebappScheme(),
             attempt.getNodeHttpAddress()),
-            attempt.getNodeHttpAddress())._().
+            attempt.getNodeHttpAddress()).__().
         td().a(".logslink", url(attempt.getLogsLink()), 
-            "logs")._().
-        _();
+            "logs").__().
+          __();
     }
 
-    table._();
-    div._();
+    table.__();
+    div.__();
 
     html.div(_INFO_WRAP).        
       // Tasks table
@@ -127,30 +126,30 @@ public class JobBlock extends HtmlBlock {
             th(_TH, "Total").
             th(_TH, "Pending").
             th(_TH, "Running").
-            th(_TH, "Complete")._().
+            th(_TH, "Complete").__().
           tr(_ODD).
             th("Map").
             td().
               div(_PROGRESSBAR).
                 $title(join(jinfo.getMapProgressPercent(), '%')). // tooltip
                 div(_PROGRESSBAR_VALUE).
-                  $style(join("width:", jinfo.getMapProgressPercent(), '%'))._()._()._().
-            td().a(url("tasks", jid, "m", "ALL"),String.valueOf(jinfo.getMapsTotal()))._().
-            td().a(url("tasks", jid, "m", "PENDING"),String.valueOf(jinfo.getMapsPending()))._().
-            td().a(url("tasks", jid, "m", "RUNNING"),String.valueOf(jinfo.getMapsRunning()))._().
-            td().a(url("tasks", jid, "m", "COMPLETED"),String.valueOf(jinfo.getMapsCompleted()))._()._().
+                  $style(join("width:", jinfo.getMapProgressPercent(), '%')).__().__().__().
+            td().a(url("tasks", jid, "m", "ALL"), String.valueOf(jinfo.getMapsTotal())).__().
+            td().a(url("tasks", jid, "m", "PENDING"), String.valueOf(jinfo.getMapsPending())).__().
+            td().a(url("tasks", jid, "m", "RUNNING"), String.valueOf(jinfo.getMapsRunning())).__().
+            td().a(url("tasks", jid, "m", "COMPLETED"), String.valueOf(jinfo.getMapsCompleted())).__().__().
           tr(_EVEN).
             th("Reduce").
             td().
               div(_PROGRESSBAR).
                 $title(join(jinfo.getReduceProgressPercent(), '%')). // tooltip
                 div(_PROGRESSBAR_VALUE).
-                  $style(join("width:", jinfo.getReduceProgressPercent(), '%'))._()._()._().
-            td().a(url("tasks", jid, "r", "ALL"),String.valueOf(jinfo.getReducesTotal()))._().
-            td().a(url("tasks", jid, "r", "PENDING"),String.valueOf(jinfo.getReducesPending()))._().
-            td().a(url("tasks", jid, "r", "RUNNING"),String.valueOf(jinfo.getReducesRunning()))._().
-            td().a(url("tasks", jid, "r", "COMPLETED"),String.valueOf(jinfo.getReducesCompleted()))._()._()
-          ._().
+                  $style(join("width:", jinfo.getReduceProgressPercent(), '%')).__().__().__().
+            td().a(url("tasks", jid, "r", "ALL"), String.valueOf(jinfo.getReducesTotal())).__().
+            td().a(url("tasks", jid, "r", "PENDING"), String.valueOf(jinfo.getReducesPending())).__().
+            td().a(url("tasks", jid, "r", "RUNNING"), String.valueOf(jinfo.getReducesRunning())).__().
+            td().a(url("tasks", jid, "r", "COMPLETED"), String.valueOf(jinfo.getReducesCompleted())).__().__()
+          .__().
         // Attempts table
         table("#job").
         tr().
@@ -159,45 +158,45 @@ public class JobBlock extends HtmlBlock {
           th(_TH, "Running").
           th(_TH, "Failed").
           th(_TH, "Killed").
-          th(_TH, "Successful")._().
+          th(_TH, "Successful").__().
         tr(_ODD).
           th("Maps").
           td().a(url("attempts", jid, "m",
               TaskAttemptStateUI.NEW.toString()),
-              String.valueOf(jinfo.getNewMapAttempts()))._().
+              String.valueOf(jinfo.getNewMapAttempts())).__().
           td().a(url("attempts", jid, "m",
               TaskAttemptStateUI.RUNNING.toString()),
-              String.valueOf(jinfo.getRunningMapAttempts()))._().
+              String.valueOf(jinfo.getRunningMapAttempts())).__().
           td().a(url("attempts", jid, "m",
               TaskAttemptStateUI.FAILED.toString()),
-              String.valueOf(jinfo.getFailedMapAttempts()))._().
+              String.valueOf(jinfo.getFailedMapAttempts())).__().
           td().a(url("attempts", jid, "m",
               TaskAttemptStateUI.KILLED.toString()),
-              String.valueOf(jinfo.getKilledMapAttempts()))._().
+              String.valueOf(jinfo.getKilledMapAttempts())).__().
           td().a(url("attempts", jid, "m",
               TaskAttemptStateUI.SUCCESSFUL.toString()),
-              String.valueOf(jinfo.getSuccessfulMapAttempts()))._().
-        _().
+              String.valueOf(jinfo.getSuccessfulMapAttempts())).__().
+        __().
         tr(_EVEN).
           th("Reduces").
           td().a(url("attempts", jid, "r",
               TaskAttemptStateUI.NEW.toString()),
-              String.valueOf(jinfo.getNewReduceAttempts()))._().
+              String.valueOf(jinfo.getNewReduceAttempts())).__().
           td().a(url("attempts", jid, "r",
               TaskAttemptStateUI.RUNNING.toString()),
-              String.valueOf(jinfo.getRunningReduceAttempts()))._().
+              String.valueOf(jinfo.getRunningReduceAttempts())).__().
           td().a(url("attempts", jid, "r",
               TaskAttemptStateUI.FAILED.toString()),
-              String.valueOf(jinfo.getFailedReduceAttempts()))._().
+              String.valueOf(jinfo.getFailedReduceAttempts())).__().
           td().a(url("attempts", jid, "r",
               TaskAttemptStateUI.KILLED.toString()),
-              String.valueOf(jinfo.getKilledReduceAttempts()))._().
+              String.valueOf(jinfo.getKilledReduceAttempts())).__().
           td().a(url("attempts", jid, "r",
               TaskAttemptStateUI.SUCCESSFUL.toString()),
-              String.valueOf(jinfo.getSuccessfulReduceAttempts()))._().
-         _().
-       _().
-     _();
+              String.valueOf(jinfo.getSuccessfulReduceAttempts())).__().
+        __().
+        __().
+        __();
   }
 
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobConfPage.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobConfPage.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobConfPage.java
index 983859e..4d6a3e2 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobConfPage.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobConfPage.java
@@ -27,7 +27,6 @@ import static org.apache.hadoop.yarn.webapp.view.JQueryUI.initID;
 import static org.apache.hadoop.yarn.webapp.view.JQueryUI.postInitID;
 import static org.apache.hadoop.yarn.webapp.view.JQueryUI.tableInit;
 
-import org.apache.hadoop.mapreduce.v2.app.webapp.ConfBlock;
 import org.apache.hadoop.yarn.webapp.SubView;
 
 /**
@@ -39,7 +38,7 @@ public class JobConfPage extends AppView {
    * (non-Javadoc)
    * @see org.apache.hadoop.mapreduce.v2.hs.webapp.HsView#preHead(org.apache.hadoop.yarn.webapp.hamlet.Hamlet.HTML)
    */
-  @Override protected void preHead(Page.HTML<_> html) {
+  @Override protected void preHead(Page.HTML<__> html) {
     String jobID = $(JOB_ID);
     set(TITLE, jobID.isEmpty() ? "Bad request: missing job ID"
         : join("Configuration for MapReduce Job ", $(JOB_ID)));

http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobPage.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobPage.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobPage.java
index 00f4750..6508fb8 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobPage.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobPage.java
@@ -27,7 +27,7 @@ import org.apache.hadoop.yarn.webapp.SubView;
 
 public class JobPage extends AppView {
 
-  @Override protected void preHead(Page.HTML<_> html) {
+  @Override protected void preHead(Page.HTML<__> html) {
     String jobID = $(JOB_ID);
     set(TITLE, jobID.isEmpty() ? "Bad request: missing job ID"
                : join("MapReduce Job ", $(JOB_ID)));

http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobsBlock.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobsBlock.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobsBlock.java
index 720219e..ff4bc00 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobsBlock.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobsBlock.java
@@ -25,9 +25,9 @@ import static org.apache.hadoop.yarn.webapp.view.JQueryUI._PROGRESSBAR_VALUE;
 import org.apache.hadoop.mapreduce.v2.app.AppContext;
 import org.apache.hadoop.mapreduce.v2.app.job.Job;
 import org.apache.hadoop.mapreduce.v2.app.webapp.dao.JobInfo;
-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;
@@ -53,34 +53,34 @@ public class JobsBlock extends HtmlBlock {
             th("Maps Completed").
             th("Reduce Progress").
             th("Reduces Total").
-            th("Reduces Completed")._()._().
+            th("Reduces Completed").__().__().
         tbody();
     for (Job j : appContext.getAllJobs().values()) {
       JobInfo job = new JobInfo(j, false);
       tbody.
         tr().
           td().
-            span().$title(String.valueOf(job.getId()))._(). // for sorting
-            a(url("job", job.getId()), job.getId())._().
+            span().$title(String.valueOf(job.getId())).__(). // for sorting
+            a(url("job", job.getId()), job.getId()).__().
           td(job.getName()).
           td(job.getState()).
           td().
-            span().$title(job.getMapProgressPercent())._(). // for sorting
+            span().$title(job.getMapProgressPercent()).__(). // for sorting
             div(_PROGRESSBAR).
               $title(join(job.getMapProgressPercent(), '%')). // tooltip
               div(_PROGRESSBAR_VALUE).
-                $style(join("width:", job.getMapProgressPercent(), '%'))._()._()._().
+                $style(join("width:", job.getMapProgressPercent(), '%')).__().__().__().
           td(String.valueOf(job.getMapsTotal())).
           td(String.valueOf(job.getMapsCompleted())).
           td().
-            span().$title(job.getReduceProgressPercent())._(). // for sorting
+            span().$title(job.getReduceProgressPercent()).__(). // for sorting
             div(_PROGRESSBAR).
               $title(join(job.getReduceProgressPercent(), '%')). // tooltip
               div(_PROGRESSBAR_VALUE).
-                $style(join("width:", job.getReduceProgressPercent(), '%'))._()._()._().
+                $style(join("width:", job.getReduceProgressPercent(), '%')).__().__().__().
           td(String.valueOf(job.getReducesTotal())).
-          td(String.valueOf(job.getReducesCompleted()))._();
+          td(String.valueOf(job.getReducesCompleted())).__();
     }
-    tbody._()._();
+    tbody.__().__();
   }
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/NavBlock.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/NavBlock.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/NavBlock.java
index 4eed7e3..58e1a43 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/NavBlock.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/NavBlock.java
@@ -25,8 +25,8 @@ import java.util.List;
 import org.apache.hadoop.mapreduce.v2.api.records.AMInfo;
 import org.apache.hadoop.mapreduce.v2.util.MRApps;
 import org.apache.hadoop.mapreduce.v2.util.MRWebAppUtil;
-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 com.google.inject.Inject;
@@ -42,13 +42,13 @@ public class NavBlock extends HtmlBlock {
       div("#nav").
         h3("Cluster").
         ul().
-          li().a(url(rmweb, "cluster", "cluster"), "About")._().
-          li().a(url(rmweb, "cluster", "apps"), "Applications")._().
-          li().a(url(rmweb, "cluster", "scheduler"), "Scheduler")._()._().
+          li().a(url(rmweb, "cluster", "cluster"), "About").__().
+          li().a(url(rmweb, "cluster", "apps"), "Applications").__().
+          li().a(url(rmweb, "cluster", "scheduler"), "Scheduler").__().__().
         h3("Application").
         ul().
-          li().a(url("app/info"), "About")._().
-          li().a(url("app"), "Jobs")._()._();
+          li().a(url("app/info"), "About").__().
+          li().a(url("app"), "Jobs").__().__();
     if (app.getJob() != null) {
       String jobid = MRApps.toString(app.getJob().getID());
       List<AMInfo> amInfos = app.getJob().getAMInfos();
@@ -58,31 +58,31 @@ public class NavBlock extends HtmlBlock {
       nav.
         h3("Job").
         ul().
-          li().a(url("job", jobid), "Overview")._().
-          li().a(url("jobcounters", jobid), "Counters")._().
-          li().a(url("conf", jobid), "Configuration")._().
-          li().a(url("tasks", jobid, "m"), "Map tasks")._().
-          li().a(url("tasks", jobid, "r"), "Reduce tasks")._().
+          li().a(url("job", jobid), "Overview").__().
+          li().a(url("jobcounters", jobid), "Counters").__().
+          li().a(url("conf", jobid), "Configuration").__().
+          li().a(url("tasks", jobid, "m"), "Map tasks").__().
+          li().a(url("tasks", jobid, "r"), "Reduce tasks").__().
           li().a(".logslink", url(MRWebAppUtil.getYARNWebappScheme(),
               nodeHttpAddress, "node",
               "containerlogs", thisAmInfo.getContainerId().toString(), 
               app.getJob().getUserName()), 
-              "AM Logs")._()._();
+              "AM Logs").__().__();
       if (app.getTask() != null) {
         String taskid = MRApps.toString(app.getTask().getID());
         nav.
           h3("Task").
           ul().
-            li().a(url("task", taskid), "Task Overview")._().
-            li().a(url("taskcounters", taskid), "Counters")._()._();
+            li().a(url("task", taskid), "Task Overview").__().
+            li().a(url("taskcounters", taskid), "Counters").__().__();
       }
     }
     nav.
       h3("Tools").
       ul().
-        li().a("/conf", "Configuration")._().
-        li().a("/logs", "Local logs")._().
-        li().a("/stacks", "Server stacks")._().
-        li().a("/jmx?qry=Hadoop:*", "Server metrics")._()._()._();
+        li().a("/conf", "Configuration").__().
+        li().a("/logs", "Local logs").__().
+        li().a("/stacks", "Server stacks").__().
+        li().a("/jmx?qry=Hadoop:*", "Server metrics").__().__().__();
   }
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/SingleCounterBlock.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/SingleCounterBlock.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/SingleCounterBlock.java
index c4311e9..02fb226 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/SingleCounterBlock.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/SingleCounterBlock.java
@@ -39,11 +39,11 @@ import org.apache.hadoop.mapreduce.v2.app.job.Job;
 import org.apache.hadoop.mapreduce.v2.app.job.Task;
 import org.apache.hadoop.mapreduce.v2.app.job.TaskAttempt;
 import org.apache.hadoop.mapreduce.v2.util.MRApps;
-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.TBODY;
-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.TBODY;
+import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TR;
 import org.apache.hadoop.yarn.webapp.view.HtmlBlock;
 
 import com.google.inject.Inject;
@@ -62,12 +62,12 @@ public class SingleCounterBlock extends HtmlBlock {
   @Override protected void render(Block html) {
     if (job == null) {
       html.
-        p()._("Sorry, no counters for nonexistent", $(JOB_ID, "job"))._();
+        p().__("Sorry, no counters for nonexistent", $(JOB_ID, "job")).__();
       return;
     }
     if (!$(TASK_ID).isEmpty() && task == null) {
       html.
-        p()._("Sorry, no counters for nonexistent", $(TASK_ID, "task"))._();
+        p().__("Sorry, no counters for nonexistent", $(TASK_ID, "task")).__();
       return;
     }
     
@@ -79,7 +79,7 @@ public class SingleCounterBlock extends HtmlBlock {
         thead().
           tr().
             th(".ui-state-default", columnType).
-            th(".ui-state-default", "Value")._()._().
+            th(".ui-state-default", "Value").__().__().
           tbody();
     for (Map.Entry<String, Long> entry : values.entrySet()) {
       TR<TBODY<TABLE<DIV<Hamlet>>>> row = tbody.tr();
@@ -87,16 +87,16 @@ public class SingleCounterBlock extends HtmlBlock {
       String val = entry.getValue().toString();
       if(task != null) {
         row.td(id);
-        row.td().br().$title(val)._()._(val)._();
+        row.td().br().$title(val).__().__(val).__();
       } else {
         row.td().a(url("singletaskcounter",entry.getKey(),
-            $(COUNTER_GROUP), $(COUNTER_NAME)), id)._();
-        row.td().br().$title(val)._().a(url("singletaskcounter",entry.getKey(),
-            $(COUNTER_GROUP), $(COUNTER_NAME)), val)._();
+            $(COUNTER_GROUP), $(COUNTER_NAME)), id).__();
+        row.td().br().$title(val).__().a(url("singletaskcounter", entry.getKey(),
+            $(COUNTER_GROUP), $(COUNTER_NAME)), val).__();
       }
-      row._();
+      row.__();
     }
-    tbody._()._()._();
+    tbody.__().__().__();
   }
 
   private void populateMembers(AppContext ctx) {

http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/SingleCounterPage.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/SingleCounterPage.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/SingleCounterPage.java
index 729b5a8..6fc1f82 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/SingleCounterPage.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/SingleCounterPage.java
@@ -21,7 +21,6 @@ package org.apache.hadoop.mapreduce.v2.app.webapp;
 import static org.apache.hadoop.mapreduce.v2.app.webapp.AMParams.TASK_ID;
 import static org.apache.hadoop.yarn.webapp.view.JQueryUI.*;
 
-import org.apache.hadoop.mapreduce.v2.app.webapp.SingleCounterBlock;
 import org.apache.hadoop.yarn.webapp.SubView;
 
 /**
@@ -33,7 +32,7 @@ public class SingleCounterPage extends AppView {
    * (non-Javadoc)
    * @see org.apache.hadoop.mapreduce.v2.hs.webapp.HsView#preHead(org.apache.hadoop.yarn.webapp.hamlet.Hamlet.HTML)
    */
-  @Override protected void preHead(Page.HTML<_> html) {
+  @Override protected void preHead(Page.HTML<__> html) {
     commonPreHead(html);
     String tid = $(TASK_ID);
     String activeNav = "3";

http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java
index 01c5b0d..bd7f7a9 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java
@@ -38,11 +38,11 @@ import org.apache.hadoop.mapreduce.v2.app.webapp.dao.TaskAttemptInfo;
 import org.apache.hadoop.mapreduce.v2.util.MRWebAppUtil;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.yarn.webapp.SubView;
-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.hamlet.Hamlet.THEAD;
-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.TABLE;
+import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TBODY;
+import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.THEAD;
+import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TR;
 import org.apache.hadoop.yarn.webapp.view.HtmlBlock;
 
 import com.google.inject.Inject;
@@ -100,7 +100,7 @@ public class TaskPage extends AppView {
             .append("  }\n")
             .append("}\n");
 
-        html.script().$type("text/javascript")._(script.toString())._();
+        html.script().$type("text/javascript").__(script.toString()).__();
       }
 
       TR<THEAD<TABLE<Hamlet>>> tr = html.table("#attempts").thead().tr();
@@ -118,7 +118,7 @@ public class TaskPage extends AppView {
         tr.th(".actions", "Actions");
       }
 
-      TBODY<TABLE<Hamlet>> tbody = tr._()._().tbody();
+      TBODY<TABLE<Hamlet>> tbody = tr.__().__().tbody();
       // Write all the data into a JavaScript array of arrays for JQuery
       // DataTables to display
       StringBuilder attemptsTableData = new StringBuilder("[\n");
@@ -178,9 +178,9 @@ public class TaskPage extends AppView {
       }
       attemptsTableData.append("]");
       html.script().$type("text/javascript").
-      _("var attemptsTableData=" + attemptsTableData)._();
+          __("var attemptsTableData=" + attemptsTableData).__();
 
-      tbody._()._();
+      tbody.__().__();
 
     }
 
@@ -197,7 +197,7 @@ public class TaskPage extends AppView {
     }
   }
 
-  @Override protected void preHead(Page.HTML<_> html) {
+  @Override protected void preHead(Page.HTML<__> html) {
     commonPreHead(html);
 
     set(initID(ACCORDION, "nav"), "{autoHeight:false, active:3}");

http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TasksBlock.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TasksBlock.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TasksBlock.java
index 78338ec..8d92dd3 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TasksBlock.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TasksBlock.java
@@ -30,9 +30,9 @@ import org.apache.hadoop.mapreduce.v2.app.job.Task;
 import org.apache.hadoop.mapreduce.v2.app.webapp.dao.TaskInfo;
 import org.apache.hadoop.mapreduce.v2.util.MRApps;
 import org.apache.hadoop.util.StringUtils;
-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;
@@ -65,7 +65,7 @@ public class TasksBlock extends HtmlBlock {
             th("State").
             th("Start Time").
             th("Finish Time").
-            th("Elapsed Time")._()._().
+            th("Elapsed Time").__().__().
         tbody();
     StringBuilder tasksTableData = new StringBuilder("[\n");
 
@@ -117,8 +117,8 @@ public class TasksBlock extends HtmlBlock {
     }
     tasksTableData.append("]");
     html.script().$type("text/javascript").
-    _("var tasksTableData=" + tasksTableData)._();
+        __("var tasksTableData=" + tasksTableData).__();
 
-    tbody._()._();
+    tbody.__().__();
   }
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TasksPage.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TasksPage.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TasksPage.java
index e2f12dc..8fce395 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TasksPage.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TasksPage.java
@@ -24,7 +24,7 @@ import static org.apache.hadoop.yarn.webapp.view.JQueryUI.*;
 
 public class TasksPage extends AppView {
 
-  @Override protected void preHead(Page.HTML<_> html) {
+  @Override protected void preHead(Page.HTML<__> html) {
     commonPreHead(html);
     set(DATATABLES_ID, "tasks");
     set(initID(ACCORDION, "nav"), "{autoHeight:false, active:2}");

http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsAboutPage.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsAboutPage.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsAboutPage.java
index f607599..d544c6b 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsAboutPage.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsAboutPage.java
@@ -21,7 +21,6 @@ package org.apache.hadoop.mapreduce.v2.hs.webapp;
 import static org.apache.hadoop.yarn.webapp.view.JQueryUI.ACCORDION;
 import static org.apache.hadoop.yarn.webapp.view.JQueryUI.initID;
 
-import org.apache.hadoop.mapreduce.v2.hs.JobHistoryServer;
 import org.apache.hadoop.mapreduce.v2.hs.webapp.dao.HistoryInfo;
 import org.apache.hadoop.yarn.util.Times;
 import org.apache.hadoop.yarn.webapp.SubView;
@@ -36,7 +35,7 @@ public class HsAboutPage extends HsView {
    * (non-Javadoc)
    * @see org.apache.hadoop.mapreduce.v2.hs.webapp.HsView#preHead(org.apache.hadoop.yarn.webapp.hamlet.Hamlet.HTML)
    */
-  @Override protected void preHead(Page.HTML<_> html) {
+  @Override protected void preHead(Page.HTML<__> html) {
     commonPreHead(html);
     //override the nav config from commonPReHead
     set(initID(ACCORDION, "nav"), "{autoHeight:false, active:0}");
@@ -49,9 +48,9 @@ public class HsAboutPage extends HsView {
   @Override protected Class<? extends SubView> content() {
     HistoryInfo info = new HistoryInfo();
     info("History Server").
-      _("BuildVersion", info.getHadoopBuildVersion()
+        __("BuildVersion", info.getHadoopBuildVersion()
         + " on " + info.getHadoopVersionBuiltOn()).
-      _("History Server started on", Times.format(info.getStartedOn()));
+        __("History Server started on", Times.format(info.getStartedOn()));
     return InfoBlock.class;
   }
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsConfPage.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsConfPage.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsConfPage.java
index 8431e22..c08ee5c 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsConfPage.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsConfPage.java
@@ -39,7 +39,7 @@ public class HsConfPage extends HsView {
    * (non-Javadoc)
    * @see org.apache.hadoop.mapreduce.v2.hs.webapp.HsView#preHead(org.apache.hadoop.yarn.webapp.hamlet.Hamlet.HTML)
    */
-  @Override protected void preHead(Page.HTML<_> html) {
+  @Override protected void preHead(Page.HTML<__> html) {
     String jobID = $(JOB_ID);
     set(TITLE, jobID.isEmpty() ? "Bad request: missing job ID"
         : join("Configuration for MapReduce Job ", $(JOB_ID)));

http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsCountersPage.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsCountersPage.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsCountersPage.java
index e70a668..1632a97 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsCountersPage.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsCountersPage.java
@@ -32,7 +32,7 @@ public class HsCountersPage extends HsView {
    * (non-Javadoc)
    * @see org.apache.hadoop.mapreduce.v2.hs.webapp.HsView#preHead(org.apache.hadoop.yarn.webapp.hamlet.Hamlet.HTML)
    */
-  @Override protected void preHead(Page.HTML<_> html) {
+  @Override protected void preHead(Page.HTML<__> html) {
     commonPreHead(html);
     setActiveNavColumnForTask();
     set(DATATABLES_SELECTOR, "#counters .dt-counters");
@@ -44,7 +44,7 @@ public class HsCountersPage extends HsView {
    * (non-Javadoc)
    * @see org.apache.hadoop.yarn.webapp.view.TwoColumnLayout#postHead(org.apache.hadoop.yarn.webapp.hamlet.Hamlet.HTML)
    */
-  @Override protected void postHead(Page.HTML<_> html) {
+  @Override protected void postHead(Page.HTML<__> html) {
     html.
       style("#counters, .dt-counters { table-layout: fixed }",
             "#counters th { overflow: hidden; vertical-align: middle }",

http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobBlock.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobBlock.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobBlock.java
index 0d5b03a..18040f0 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobBlock.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobBlock.java
@@ -43,9 +43,9 @@ import org.apache.hadoop.mapreduce.v2.util.MRWebAppUtil;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.yarn.util.Times;
 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.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;
 
@@ -69,38 +69,38 @@ public class HsJobBlock extends HtmlBlock {
     String jid = $(JOB_ID);
     if (jid.isEmpty()) {
       html.
-        p()._("Sorry, can't do anything without a JobID.")._();
+        p().__("Sorry, can't do anything without a JobID.").__();
       return;
     }
     JobId jobID = MRApps.toJobID(jid);
     Job j = appContext.getJob(jobID);
     if (j == null) {
-      html.p()._("Sorry, ", jid, " not found.")._();
+      html.p().__("Sorry, ", jid, " not found.").__();
       return;
     }
     if(j instanceof UnparsedJob) {
       final int taskCount = j.getTotalMaps() + j.getTotalReduces();
       UnparsedJob oversizedJob = (UnparsedJob) j;
-      html.p()._("The job has a total of " + taskCount + " tasks. ")
-          ._("Any job larger than " + oversizedJob.getMaxTasksAllowed() +
-              " will not be loaded.")._();
-      html.p()._("You can either use the CLI tool: 'mapred job -history'"
+      html.p().__("The job has a total of " + taskCount + " tasks. ")
+          .__("Any job larger than " + oversizedJob.getMaxTasksAllowed() +
+              " will not be loaded.").__();
+      html.p().__("You can either use the CLI tool: 'mapred job -history'"
           + " to view large jobs or adjust the property " +
-          JHAdminConfig.MR_HS_LOADED_JOBS_TASKS_MAX + ".")._();
+          JHAdminConfig.MR_HS_LOADED_JOBS_TASKS_MAX + ".").__();
       return;
     }
     List<AMInfo> amInfos = j.getAMInfos();
     JobInfo job = new JobInfo(j);
     ResponseInfo infoBlock = info("Job Overview").
-        _("Job Name:", job.getName()).
-        _("User Name:", job.getUserName()).
-        _("Queue:", job.getQueueName()).
-        _("State:", job.getState()).
-        _("Uberized:", job.isUber()).
-        _("Submitted:", new Date(job.getSubmitTime())).
-        _("Started:", job.getStartTimeStr()).
-        _("Finished:", new Date(job.getFinishTime())).
-        _("Elapsed:", StringUtils.formatTime(
+        __("Job Name:", job.getName()).
+        __("User Name:", job.getUserName()).
+        __("Queue:", job.getQueueName()).
+        __("State:", job.getState()).
+        __("Uberized:", job.isUber()).
+        __("Submitted:", new Date(job.getSubmitTime())).
+        __("Started:", job.getStartTimeStr()).
+        __("Finished:", new Date(job.getFinishTime())).
+        __("Elapsed:", StringUtils.formatTime(
             Times.elapsed(job.getStartTime(), job.getFinishTime(), false)));
     
     String amString =
@@ -117,19 +117,19 @@ public class HsJobBlock extends HtmlBlock {
     }
 
     if(job.getNumMaps() > 0) {
-      infoBlock._("Average Map Time", StringUtils.formatTime(job.getAvgMapTime()));
+      infoBlock.__("Average Map Time", StringUtils.formatTime(job.getAvgMapTime()));
     }
     if(job.getNumReduces() > 0) {
-      infoBlock._("Average Shuffle Time", StringUtils.formatTime(job.getAvgShuffleTime()));
-      infoBlock._("Average Merge Time", StringUtils.formatTime(job.getAvgMergeTime()));
-      infoBlock._("Average Reduce Time", StringUtils.formatTime(job.getAvgReduceTime()));
+      infoBlock.__("Average Shuffle Time", StringUtils.formatTime(job.getAvgShuffleTime()));
+      infoBlock.__("Average Merge Time", StringUtils.formatTime(job.getAvgMergeTime()));
+      infoBlock.__("Average Reduce Time", StringUtils.formatTime(job.getAvgReduceTime()));
     }
 
     for (ConfEntryInfo entry : job.getAcls()) {
-      infoBlock._("ACL "+entry.getName()+":", entry.getValue());
+      infoBlock.__("ACL "+entry.getName()+":", entry.getValue());
     }
     DIV<Hamlet> div = html.
-      _(InfoBlock.class).
+        __(InfoBlock.class).
       div(_INFO_WRAP);
     
       // MRAppMasters Table
@@ -137,13 +137,13 @@ public class HsJobBlock extends HtmlBlock {
         table.
           tr().
             th(amString).
-          _().
+            __().
           tr().
             th(_TH, "Attempt Number").
             th(_TH, "Start Time").
             th(_TH, "Node").
             th(_TH, "Logs").
-            _();
+            __();
         boolean odd = false;
           for (AMInfo amInfo : amInfos) {
             AMAttemptInfo attempt = new AMAttemptInfo(amInfo,
@@ -153,13 +153,13 @@ public class HsJobBlock extends HtmlBlock {
               td(new Date(attempt.getStartTime()).toString()).
               td().a(".nodelink", url(MRWebAppUtil.getYARNWebappScheme(),
                   attempt.getNodeHttpAddress()),
-                  attempt.getNodeHttpAddress())._().
+                  attempt.getNodeHttpAddress()).__().
               td().a(".logslink", url(attempt.getLogsLink()),
-                      "logs")._().
-            _();
+                      "logs").__().
+                __();
           }
-          table._();
-          div._();
+          table.__();
+          div.__();
           
         
         html.div(_INFO_WRAP).        
@@ -169,18 +169,18 @@ public class HsJobBlock extends HtmlBlock {
           tr().
             th(_TH, "Task Type").
             th(_TH, "Total").
-            th(_TH, "Complete")._().
+            th(_TH, "Complete").__().
           tr(_ODD).
             th().
-              a(url("tasks", jid, "m"), "Map")._().
+              a(url("tasks", jid, "m"), "Map").__().
             td(String.valueOf(String.valueOf(job.getMapsTotal()))).
-            td(String.valueOf(String.valueOf(job.getMapsCompleted())))._().
+            td(String.valueOf(String.valueOf(job.getMapsCompleted()))).__().
           tr(_EVEN).
             th().
-              a(url("tasks", jid, "r"), "Reduce")._().
+              a(url("tasks", jid, "r"), "Reduce").__().
             td(String.valueOf(String.valueOf(job.getReducesTotal()))).
-            td(String.valueOf(String.valueOf(job.getReducesCompleted())))._()
-          ._().
+            td(String.valueOf(String.valueOf(job.getReducesCompleted()))).__()
+          .__().
 
         // Attempts table
         table("#job").
@@ -188,33 +188,33 @@ public class HsJobBlock extends HtmlBlock {
           th(_TH, "Attempt Type").
           th(_TH, "Failed").
           th(_TH, "Killed").
-          th(_TH, "Successful")._().
+          th(_TH, "Successful").__().
         tr(_ODD).
           th("Maps").
           td().a(url("attempts", jid, "m",
               TaskAttemptStateUI.FAILED.toString()), 
-              String.valueOf(job.getFailedMapAttempts()))._().
+              String.valueOf(job.getFailedMapAttempts())).__().
           td().a(url("attempts", jid, "m",
               TaskAttemptStateUI.KILLED.toString()), 
-              String.valueOf(job.getKilledMapAttempts()))._().
+              String.valueOf(job.getKilledMapAttempts())).__().
           td().a(url("attempts", jid, "m",
               TaskAttemptStateUI.SUCCESSFUL.toString()), 
-              String.valueOf(job.getSuccessfulMapAttempts()))._().
-        _().
+              String.valueOf(job.getSuccessfulMapAttempts())).__().
+            __().
         tr(_EVEN).
           th("Reduces").
           td().a(url("attempts", jid, "r",
               TaskAttemptStateUI.FAILED.toString()), 
-              String.valueOf(job.getFailedReduceAttempts()))._().
+              String.valueOf(job.getFailedReduceAttempts())).__().
           td().a(url("attempts", jid, "r",
               TaskAttemptStateUI.KILLED.toString()), 
-              String.valueOf(job.getKilledReduceAttempts()))._().
+              String.valueOf(job.getKilledReduceAttempts())).__().
           td().a(url("attempts", jid, "r",
               TaskAttemptStateUI.SUCCESSFUL.toString()), 
-              String.valueOf(job.getSuccessfulReduceAttempts()))._().
-         _().
-       _().
-     _();
+              String.valueOf(job.getSuccessfulReduceAttempts())).__().
+            __().
+            __().
+            __();
   }
 
   static String addTaskLinks(String text) {

http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobPage.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobPage.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobPage.java
index 4c81a13..f40c878 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobPage.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobPage.java
@@ -34,7 +34,7 @@ public class HsJobPage extends HsView {
    * (non-Javadoc)
    * @see org.apache.hadoop.mapreduce.v2.hs.webapp.HsView#preHead(org.apache.hadoop.yarn.webapp.hamlet.Hamlet.HTML)
    */
-  @Override protected void preHead(Page.HTML<_> html) {
+  @Override protected void preHead(Page.HTML<__> html) {
     String jobID = $(JOB_ID);
     set(TITLE, jobID.isEmpty() ? "Bad request: missing job ID"
                : join("MapReduce Job ", $(JOB_ID)));

http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobsBlock.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobsBlock.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobsBlock.java
index b234ca3..ef563f6 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobsBlock.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobsBlock.java
@@ -27,10 +27,10 @@ import org.apache.hadoop.mapreduce.v2.app.job.Job;
 import org.apache.hadoop.mapreduce.v2.hs.webapp.dao.JobInfo;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.yarn.util.Times;
-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.hamlet.HamletSpec.InputType;
+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.hamlet2.HamletSpec.InputType;
 import org.apache.hadoop.yarn.webapp.view.HtmlBlock;
 
 import com.google.inject.Inject;
@@ -69,7 +69,7 @@ public class HsJobsBlock extends HtmlBlock {
             th("Maps Completed").
             th("Reduces Total").
             th("Reduces Completed").
-            th("Elapsed Time")._()._().
+            th("Elapsed Time").__().__().
         tbody();
     LOG.info("Getting list of all Jobs.");
     // Write all the data into a JavaScript array of arrays for JQuery
@@ -105,38 +105,38 @@ public class HsJobsBlock extends HtmlBlock {
     }
     jobsTableData.append("]");
     html.script().$type("text/javascript").
-    _("var jobsTableData=" + jobsTableData)._();
-    tbody._().
+        __("var jobsTableData=" + jobsTableData).__();
+    tbody.__().
     tfoot().
       tr().
         th().input("search_init").$type(InputType.text)
-          .$name("submit_time").$value("Submit Time")._()._().
+          .$name("submit_time").$value("Submit Time").__().__().
         th().input("search_init").$type(InputType.text)
-          .$name("start_time").$value("Start Time")._()._().
+          .$name("start_time").$value("Start Time").__().__().
         th().input("search_init").$type(InputType.text)
-          .$name("finish_time").$value("Finish Time")._()._().
+          .$name("finish_time").$value("Finish Time").__().__().
         th().input("search_init").$type(InputType.text)
-          .$name("job_id").$value("Job ID")._()._().
+          .$name("job_id").$value("Job ID").__().__().
         th().input("search_init").$type(InputType.text)
-          .$name("name").$value("Name")._()._().
+          .$name("name").$value("Name").__().__().
         th().input("search_init").$type(InputType.text)
-          .$name("user").$value("User")._()._().
+          .$name("user").$value("User").__().__().
         th().input("search_init").$type(InputType.text)
-          .$name("queue").$value("Queue")._()._().
+          .$name("queue").$value("Queue").__().__().
         th().input("search_init").$type(InputType.text)
-          .$name("state").$value("State")._()._().
+          .$name("state").$value("State").__().__().
         th().input("search_init").$type(InputType.text)
-          .$name("maps_total").$value("Maps Total")._()._().
+          .$name("maps_total").$value("Maps Total").__().__().
         th().input("search_init").$type(InputType.text).
-          $name("maps_completed").$value("Maps Completed")._()._().
+          $name("maps_completed").$value("Maps Completed").__().__().
         th().input("search_init").$type(InputType.text).
-          $name("reduces_total").$value("Reduces Total")._()._().
+          $name("reduces_total").$value("Reduces Total").__().__().
         th().input("search_init").$type(InputType.text).
-          $name("reduces_completed").$value("Reduces Completed")._()._().
+          $name("reduces_completed").$value("Reduces Completed").__().__().
         th().input("search_init").$type(InputType.text).
-          $name("elapsed_time").$value("Elapsed Time")._()._().
-        _().
-      _().
-    _();
+          $name("elapsed_time").$value("Elapsed Time").__().__().
+        __().
+        __().
+        __();
   }
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsLogsPage.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsLogsPage.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsLogsPage.java
index f483dc9..2bee3ba 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsLogsPage.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsLogsPage.java
@@ -26,7 +26,7 @@ public class HsLogsPage extends HsView {
    * (non-Javadoc)
    * @see org.apache.hadoop.mapreduce.v2.hs.webapp.HsView#preHead(org.apache.hadoop.yarn.webapp.hamlet.Hamlet.HTML)
    */
-  @Override protected void preHead(Page.HTML<_> html) {
+  @Override protected void preHead(Page.HTML<__> html) {
     commonPreHead(html);
     setActiveNavColumnForTask();
   }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsNavBlock.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsNavBlock.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsNavBlock.java
index 7e49d52..9ef5a0f 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsNavBlock.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsNavBlock.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.mapreduce.v2.hs.webapp;
 
 import org.apache.hadoop.mapreduce.v2.app.webapp.App;
 import org.apache.hadoop.mapreduce.v2.util.MRApps;
-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 com.google.inject.Inject;
@@ -43,33 +43,33 @@ public class HsNavBlock extends HtmlBlock {
       div("#nav").
       h3("Application").
         ul().
-          li().a(url("about"), "About")._().
-          li().a(url("app"), "Jobs")._()._();
+          li().a(url("about"), "About").__().
+          li().a(url("app"), "Jobs").__().__();
     if (app.getJob() != null) {
       String jobid = MRApps.toString(app.getJob().getID());
       nav.
         h3("Job").
         ul().
-          li().a(url("job", jobid), "Overview")._().
-          li().a(url("jobcounters", jobid), "Counters")._().
-          li().a(url("conf", jobid), "Configuration")._().
-          li().a(url("tasks", jobid, "m"), "Map tasks")._().
-          li().a(url("tasks", jobid, "r"), "Reduce tasks")._()._();
+          li().a(url("job", jobid), "Overview").__().
+          li().a(url("jobcounters", jobid), "Counters").__().
+          li().a(url("conf", jobid), "Configuration").__().
+          li().a(url("tasks", jobid, "m"), "Map tasks").__().
+          li().a(url("tasks", jobid, "r"), "Reduce tasks").__().__();
       if (app.getTask() != null) {
         String taskid = MRApps.toString(app.getTask().getID());
         nav.
           h3("Task").
           ul().
-            li().a(url("task", taskid), "Task Overview")._().
-            li().a(url("taskcounters", taskid), "Counters")._()._();
+            li().a(url("task", taskid), "Task Overview").__().
+            li().a(url("taskcounters", taskid), "Counters").__().__();
       }
     }
     nav.
       h3("Tools").
         ul().
-          li().a("/conf", "Configuration")._().
-          li().a("/logs", "Local logs")._().
-          li().a("/stacks", "Server stacks")._().
-          li().a("/jmx?qry=Hadoop:*", "Server metrics")._()._()._();
+          li().a("/conf", "Configuration").__().
+          li().a("/logs", "Local logs").__().
+          li().a("/stacks", "Server stacks").__().
+          li().a("/jmx?qry=Hadoop:*", "Server metrics").__().__().__();
   }
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsSingleCounterPage.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsSingleCounterPage.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsSingleCounterPage.java
index 5f97b8f..bc2c2c8 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsSingleCounterPage.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsSingleCounterPage.java
@@ -32,7 +32,7 @@ public class HsSingleCounterPage extends HsView {
    * (non-Javadoc)
    * @see org.apache.hadoop.mapreduce.v2.hs.webapp.HsView#preHead(org.apache.hadoop.yarn.webapp.hamlet.Hamlet.HTML)
    */
-  @Override protected void preHead(Page.HTML<_> html) {
+  @Override protected void preHead(Page.HTML<__> html) {
     commonPreHead(html);
     setActiveNavColumnForTask();
     set(DATATABLES_ID, "singleCounter");


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message