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/HsTaskPage.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsTaskPage.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsTaskPage.java index 6403e3b..c5117ed 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsTaskPage.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsTaskPage.java @@ -39,16 +39,15 @@ import org.apache.hadoop.mapreduce.v2.util.MRApps; import org.apache.hadoop.mapreduce.v2.util.MRWebAppUtil; import org.apache.hadoop.yarn.util.Times; 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.TFOOT; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.THEAD; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TR; -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.Hamlet.TFOOT; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.THEAD; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TR; +import org.apache.hadoop.yarn.webapp.hamlet2.HamletSpec.InputType; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; -import com.google.common.base.Joiner; import com.google.inject.Inject; /** @@ -110,7 +109,7 @@ public class HsTaskPage extends HsView { headRow.th("Elapsed Time"). th(".note", "Note"); - TBODY<TABLE<Hamlet>> tbody = headRow._()._().tbody(); + TBODY<TABLE<Hamlet>> tbody = headRow.__().__().tbody(); // Write all the data into a JavaScript array of arrays for JQuery // DataTables to display StringBuilder attemptsTableData = new StringBuilder("[\n"); @@ -182,55 +181,55 @@ public class HsTaskPage extends HsView { } attemptsTableData.append("]"); html.script().$type("text/javascript"). - _("var attemptsTableData=" + attemptsTableData)._(); + __("var attemptsTableData=" + attemptsTableData).__(); - TR<TFOOT<TABLE<Hamlet>>> footRow = tbody._().tfoot().tr(); + TR<TFOOT<TABLE<Hamlet>>> footRow = tbody.__().tfoot().tr(); footRow. th().input("search_init").$type(InputType.text). - $name("attempt_name").$value("Attempt")._()._(). + $name("attempt_name").$value("Attempt").__().__(). th().input("search_init").$type(InputType.text). - $name("attempt_state").$value("State")._()._(). + $name("attempt_state").$value("State").__().__(). th().input("search_init").$type(InputType.text). - $name("attempt_status").$value("Status")._()._(). + $name("attempt_status").$value("Status").__().__(). th().input("search_init").$type(InputType.text). - $name("attempt_node").$value("Node")._()._(). + $name("attempt_node").$value("Node").__().__(). th().input("search_init").$type(InputType.text). - $name("attempt_node").$value("Logs")._()._(). + $name("attempt_node").$value("Logs").__().__(). th().input("search_init").$type(InputType.text). - $name("attempt_start_time").$value("Start Time")._()._(); + $name("attempt_start_time").$value("Start Time").__().__(); if(type == TaskType.REDUCE) { footRow. th().input("search_init").$type(InputType.text). - $name("shuffle_time").$value("Shuffle Time")._()._(); + $name("shuffle_time").$value("Shuffle Time").__().__(); footRow. th().input("search_init").$type(InputType.text). - $name("merge_time").$value("Merge Time")._()._(); + $name("merge_time").$value("Merge Time").__().__(); } footRow. th().input("search_init").$type(InputType.text). - $name("attempt_finish").$value("Finish Time")._()._(); + $name("attempt_finish").$value("Finish Time").__().__(); if(type == TaskType.REDUCE) { footRow. th().input("search_init").$type(InputType.text). - $name("elapsed_shuffle_time").$value("Elapsed Shuffle Time")._()._(); + $name("elapsed_shuffle_time").$value("Elapsed Shuffle Time").__().__(); footRow. th().input("search_init").$type(InputType.text). - $name("elapsed_merge_time").$value("Elapsed Merge Time")._()._(); + $name("elapsed_merge_time").$value("Elapsed Merge Time").__().__(); footRow. th().input("search_init").$type(InputType.text). - $name("elapsed_reduce_time").$value("Elapsed Reduce Time")._()._(); + $name("elapsed_reduce_time").$value("Elapsed Reduce Time").__().__(); } footRow. th().input("search_init").$type(InputType.text). - $name("attempt_elapsed").$value("Elapsed Time")._()._(). + $name("attempt_elapsed").$value("Elapsed Time").__().__(). th().input("search_init").$type(InputType.text). - $name("note").$value("Note")._()._(); + $name("note").$value("Note").__().__(); - footRow._()._()._(); + footRow.__().__().__(); } protected String getAttemptId(TaskId taskId, TaskAttemptInfo ta) { @@ -256,7 +255,7 @@ public class HsTaskPage 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: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/HsTasksBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsTasksBlock.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsTasksBlock.java index 9511c06..702c13c 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsTasksBlock.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsTasksBlock.java @@ -28,14 +28,13 @@ import org.apache.hadoop.mapreduce.v2.app.webapp.dao.ReduceTaskAttemptInfo; import org.apache.hadoop.mapreduce.v2.app.webapp.dao.TaskAttemptInfo; 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.hamlet.Hamlet.TFOOT; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.THEAD; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TR; -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.Hamlet.TFOOT; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.THEAD; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TR; +import org.apache.hadoop.yarn.webapp.hamlet2.HamletSpec.InputType; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; import com.google.inject.Inject; @@ -74,10 +73,10 @@ public class HsTasksBlock extends HtmlBlock { //Create the spanning row int attemptColSpan = type == TaskType.REDUCE ? 8 : 3; thead.tr(). - th().$colspan(5).$class("ui-state-default")._("Task")._(). + th().$colspan(5).$class("ui-state-default").__("Task").__(). th().$colspan(attemptColSpan).$class("ui-state-default"). - _("Successful Attempt")._(). - _(); + __("Successful Attempt").__(). + __(); TR<THEAD<TABLE<Hamlet>>> theadRow = thead. tr(). @@ -102,7 +101,7 @@ public class HsTasksBlock extends HtmlBlock { } theadRow.th("Elapsed Time"); //Attempt - TBODY<TABLE<Hamlet>> tbody = theadRow._()._().tbody(); + TBODY<TABLE<Hamlet>> tbody = theadRow.__().__().tbody(); // Write all the data into a JavaScript array of arrays for JQuery // DataTables to display @@ -173,41 +172,41 @@ public class HsTasksBlock extends HtmlBlock { } tasksTableData.append("]"); html.script().$type("text/javascript"). - _("var tasksTableData=" + tasksTableData)._(); + __("var tasksTableData=" + tasksTableData).__(); - TR<TFOOT<TABLE<Hamlet>>> footRow = tbody._().tfoot().tr(); + TR<TFOOT<TABLE<Hamlet>>> footRow = tbody.__().tfoot().tr(); footRow.th().input("search_init").$type(InputType.text).$name("task") - .$value("ID")._()._().th().input("search_init").$type(InputType.text) - .$name("state").$value("State")._()._().th().input("search_init") - .$type(InputType.text).$name("start_time").$value("Start Time")._()._() + .$value("ID").__().__().th().input("search_init").$type(InputType.text) + .$name("state").$value("State").__().__().th().input("search_init") + .$type(InputType.text).$name("start_time").$value("Start Time").__().__() .th().input("search_init").$type(InputType.text).$name("finish_time") - .$value("Finish Time")._()._().th().input("search_init") - .$type(InputType.text).$name("elapsed_time").$value("Elapsed Time")._() - ._().th().input("search_init").$type(InputType.text) - .$name("attempt_start_time").$value("Start Time")._()._(); + .$value("Finish Time").__().__().th().input("search_init") + .$type(InputType.text).$name("elapsed_time").$value("Elapsed Time").__() + .__().th().input("search_init").$type(InputType.text) + .$name("attempt_start_time").$value("Start Time").__().__(); if(type == TaskType.REDUCE) { footRow.th().input("search_init").$type(InputType.text) - .$name("shuffle_time").$value("Shuffle Time")._()._(); + .$name("shuffle_time").$value("Shuffle Time").__().__(); footRow.th().input("search_init").$type(InputType.text) - .$name("merge_time").$value("Merge Time")._()._(); + .$name("merge_time").$value("Merge Time").__().__(); } footRow.th().input("search_init").$type(InputType.text) - .$name("attempt_finish").$value("Finish Time")._()._(); + .$name("attempt_finish").$value("Finish Time").__().__(); if(type == TaskType.REDUCE) { footRow.th().input("search_init").$type(InputType.text) - .$name("elapsed_shuffle_time").$value("Elapsed Shuffle Time")._()._(); + .$name("elapsed_shuffle_time").$value("Elapsed Shuffle Time").__().__(); footRow.th().input("search_init").$type(InputType.text) - .$name("elapsed_merge_time").$value("Elapsed Merge Time")._()._(); + .$name("elapsed_merge_time").$value("Elapsed Merge Time").__().__(); footRow.th().input("search_init").$type(InputType.text) - .$name("elapsed_reduce_time").$value("Elapsed Reduce Time")._()._(); + .$name("elapsed_reduce_time").$value("Elapsed Reduce Time").__().__(); } footRow.th().input("search_init").$type(InputType.text) - .$name("attempt_elapsed").$value("Elapsed Time")._()._(); + .$name("attempt_elapsed").$value("Elapsed Time").__().__(); - footRow._()._()._(); + footRow.__().__().__(); } } 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/HsTasksPage.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsTasksPage.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsTasksPage.java index 3c3386e..d088591 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsTasksPage.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsTasksPage.java @@ -41,7 +41,7 @@ public class HsTasksPage 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); set(DATATABLES_ID, "tasks"); set(DATATABLES_SELECTOR, ".dt-tasks" ); 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/HsView.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsView.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsView.java index 8e39087..510ece6 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsView.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsView.java @@ -39,7 +39,7 @@ public class HsView extends TwoColumnLayout { * (non-Javadoc) * @see org.apache.hadoop.yarn.webapp.view.TwoColumnLayout#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); set(DATATABLES_ID, "jobs"); set(initID(DATATABLES, "jobs"), jobsTableInit()); @@ -51,7 +51,7 @@ public class HsView extends TwoColumnLayout { * The prehead that should be common to all subclasses. * @param html used to render. */ - 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-common/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml index 505e20f..f17cf8c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml @@ -341,4 +341,26 @@ </plugin> </plugins> </build> + <!-- TODO: Remove this profile when hamlet was removed. --> + <profiles> + <profile> + <id>java9</id> + <activation> + <jdk>9</jdk> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <excludes> + <exclude>src/main/java/org/apache/hadoop/yarn/webapp/hamlet/**</exclude> + <exclude>src/main/test/org/apache/haodop/yarn/webapp/hamlet/**</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> 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/ResponseInfo.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/ResponseInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/ResponseInfo.java index b04bc5d..94063ed 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/ResponseInfo.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/ResponseInfo.java @@ -75,12 +75,12 @@ public class ResponseInfo implements Iterable<ResponseInfo.Item> { return about; } - public ResponseInfo _(String key, Object value) { + public ResponseInfo __(String key, Object value) { items.add(Item.of(key, value, false)); return this; } - public ResponseInfo _(String key, String url, Object anchor) { + public ResponseInfo __(String key, String url, Object anchor) { if (url == null) { items.add(Item.of(key, anchor, false)); } else { 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/example/HelloWorld.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/example/HelloWorld.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/example/HelloWorld.java index 9b5cbd1..4376b6e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/example/HelloWorld.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/example/HelloWorld.java @@ -41,11 +41,11 @@ public class HelloWorld { } public static class HelloView extends HtmlPage { - @Override protected void render(Page.HTML<_> html) { + @Override protected void render(Page.HTML<__> html) { html. // produces valid html 4.01 strict title($("title")). p("#hello-for-css"). - _($("title"))._()._(); + __($("title")).__().__(); } } 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/example/MyApp.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/example/MyApp.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/example/MyApp.java index 3973f68..e13a883 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/example/MyApp.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/example/MyApp.java @@ -60,12 +60,12 @@ public class MyApp { public static class MyView extends HtmlPage { // You can inject the app in views if needed. @Override - public void render(Page.HTML<_> html) { + public void render(Page.HTML<__> html) { html. title("My App"). p("#content_id_for_css_styling"). - _("You can have", $("anything"))._()._(); - // Note, there is no _(); (to parent element) method at root level. + __("You can have", $("anything")).__().__(); + // Note, there is no __(); (to parent element) method at root level. // and IDE provides instant feedback on what level you're on in // the auto-completion drop-downs. } 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/hamlet/Hamlet.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/hamlet/Hamlet.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/hamlet/Hamlet.java index 58d9066..7213865 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/hamlet/Hamlet.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/hamlet/Hamlet.java @@ -29,6 +29,10 @@ import java.util.EnumSet; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.yarn.webapp.SubView; +/** + * @deprecated Use org.apache.hadoop.yarn.webapp.hamlet2 package instead. + */ +@Deprecated @InterfaceAudience.LimitedPrivate({"YARN", "MapReduce"}) public class Hamlet extends HamletImpl implements HamletSpec._Html { public Hamlet(PrintWriter out, int nestLevel, boolean wasInline) { 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/hamlet/HamletGen.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/hamlet/HamletGen.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/hamlet/HamletGen.java index 5acb3f3..8a2db8f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/hamlet/HamletGen.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/hamlet/HamletGen.java @@ -43,7 +43,9 @@ import org.slf4j.LoggerFactory; /** * Generates a specific hamlet implementation class from a spec class * using a generic hamlet implementation class. + * @deprecated Use org.apache.hadoop.yarn.webapp.hamlet2 package instead. */ +@Deprecated @InterfaceAudience.LimitedPrivate({"YARN", "MapReduce"}) public class HamletGen { static final Logger LOG = LoggerFactory.getLogger(HamletGen.class); 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/hamlet/HamletImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/hamlet/HamletImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/hamlet/HamletImpl.java index d792d31..289ad70 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/hamlet/HamletImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/hamlet/HamletImpl.java @@ -43,7 +43,9 @@ import org.apache.hadoop.yarn.webapp.WebAppException; * optimized to use a thread-local element pool. * * Prints HTML as it builds. So the order is important. + * @deprecated Use org.apache.hadoop.yarn.webapp.hamlet2 package instead. */ +@Deprecated @InterfaceAudience.Private public class HamletImpl extends HamletSpec { private static final String INDENT_CHARS = " "; 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/hamlet/HamletSpec.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/hamlet/HamletSpec.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/hamlet/HamletSpec.java index 081516c..e3bb6d1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/hamlet/HamletSpec.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/hamlet/HamletSpec.java @@ -43,7 +43,9 @@ import org.apache.hadoop.yarn.webapp.SubView; * UPPERCASE, corresponding to an element definition in the DTD. $lowercase is * used as attribute builder methods to differentiate from element builder * methods. + * @deprecated Use org.apache.hadoop.yarn.webapp.hamlet2 package instead. */ +@Deprecated @InterfaceAudience.LimitedPrivate({"YARN", "MapReduce"}) public class HamletSpec { // The enum values are lowercase for better compression, 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/hamlet/package-info.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/hamlet/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/hamlet/package-info.java index 3286ab5..4d0cf49 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/hamlet/package-info.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/hamlet/package-info.java @@ -15,6 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +/** + * Deprecated. + * Use org.apache.hadoop.yarn.webapp.hamlet2 package instead. + */ +@Deprecated @InterfaceAudience.LimitedPrivate({"YARN", "MapReduce"}) package org.apache.hadoop.yarn.webapp.hamlet; import org.apache.hadoop.classification.InterfaceAudience; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
